Bernd Kuhls
2025-07-04 18:54:17 +02:00
committed by Julien Olivain
parent 0365490f7d
commit 6baca88959
3 changed files with 4 additions and 41 deletions

View File

@@ -1,37 +0,0 @@
From 3c9de31dda1a1d44fade7a61e66c989178d6c2a4 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <thomas@devoogdt.com>
Date: Sun, 26 Jan 2025 10:15:39 +0100
Subject: [PATCH] meson.build: explicitly check for pthread support
Tested using buildroot. The br-arm-full-nothread fails
because meson assumes thread support when cross-compiling.
Dependency threads found: YES unknown (cached)
Has header "pthread.h" : NO
Upstream: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/aad470dad519b6fe3459023b82941b4414b71313
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 4439758..07e242b 100644
--- a/meson.build
+++ b/meson.build
@@ -383,8 +383,10 @@ endif
if host_machine.system() != 'windows'
thread_dep = dependency('threads')
- conf.set('HAVE_PTHREAD', 1)
- deps += [thread_dep]
+ if thread_dep.found() and cc.has_header('pthread.h')
+ conf.set('HAVE_PTHREAD', 1)
+ deps += [thread_dep]
+ endif
endif
fc_templatedir = get_option('template-dir')
--
2.43.0

View File

@@ -1,5 +1,5 @@
# From https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz.sha256sum
sha256 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220 fontconfig-2.16.0.tar.xz
# From https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/2.17.1/fontconfig-2.17.1.tar.xz.sha256sum
sha256 9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541 fontconfig-2.17.1.tar.xz
# Locally calculated
sha256 51a51aa9823704fd90bccc616cdd17ebabb5b2b3e9cbde886ca02c7002288067 COPYING

View File

@@ -4,8 +4,8 @@
#
################################################################################
FONTCONFIG_VERSION = 2.16.0
FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release
FONTCONFIG_VERSION = 2.17.1
FONTCONFIG_SITE = https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/$(FONTCONFIG_VERSION)
FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.xz
FONTCONFIG_INSTALL_STAGING = YES
FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \