* [Buildroot] [PATCH 1/2] package/fontconfig: add pthread as a dependency of a static lib
@ 2020-09-20 11:22 Bernd Kuhls
2020-09-20 11:22 ` [Buildroot] [PATCH 2/2] package/fbterm: remove fontconfig fix Bernd Kuhls
0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2020-09-20 11:22 UTC (permalink / raw
To: buildroot
Fixes:
http://autobuild.buildroot.net/results/99f/99f9da23bb272fb109e03c85ef48dd7b350d0733/
for the ffmpeg package.
Please note that the ffmpeg build error was reproducible but with a
different error message in ffbuild/config.log:
sysroot/usr/lib/libfontconfig.a(fccache.o): in function `lock_cache':
fccache.c:(.text+0xcd8): undefined reference to `pthread_mutex_init'
arm-buildroot-linux-gnueabi/bin/ld: fccache.c:(.text+0xcf8):
undefined reference to `pthread_mutex_destroy'
arm-buildroot-linux-gnueabi/bin/ld: fccache.c:(.text+0xd00):
undefined reference to `pthread_mutex_lock'
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...read-as-a-dependency-of-a-static-lib.patch | 44 +++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100644 package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch
diff --git a/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch b/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch
new file mode 100644
index 0000000000..3112676649
--- /dev/null
+++ b/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch
@@ -0,0 +1,44 @@
+From 40ec04a8bf36dd8d0aa3da98b167792ce2dcd114 Mon Sep 17 00:00:00 2001
+From: Silvan Scherrer <silvan.scherrer@aroa.ch>
+Date: Sun, 20 Sep 2020 12:52:08 +0200
+Subject: [PATCH 1/1] add pthread as a dependency of a static lib
+
+Downloaded from https://trac.netlabs.org/ports/changeset/2220
+
+Patch sent upstream:
+https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 2 ++
+ fontconfig.pc.in | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f3189a7..594d6fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -690,6 +690,8 @@ fi
+ have_pthread=false
+ if test "$os_win32" = no; then
+ AX_PTHREAD([have_pthread=true])
++ AC_SUBST(PTHREAD_CFLAGS)
++ AC_SUBST(PTHREAD_LIBS)
+ fi
+ if $have_pthread; then
+ LIBS="$PTHREAD_LIBS $LIBS"
+diff --git a/fontconfig.pc.in b/fontconfig.pc.in
+index 61b35fb..f823bac 100644
+--- a/fontconfig.pc.in
++++ b/fontconfig.pc.in
+@@ -14,5 +14,5 @@ Version: @VERSION@
+ Requires: @PKGCONFIG_REQUIRES@
+ Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
+-Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@
++Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ @PTHREAD_LIBS@
++Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ @PTHREAD_CFLAGS@
+--
+2.27.0
+
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 2/2] package/fbterm: remove fontconfig fix
2020-09-20 11:22 [Buildroot] [PATCH 1/2] package/fontconfig: add pthread as a dependency of a static lib Bernd Kuhls
@ 2020-09-20 11:22 ` Bernd Kuhls
0 siblings, 0 replies; 2+ messages in thread
From: Bernd Kuhls @ 2020-09-20 11:22 UTC (permalink / raw
To: buildroot
The previous patch added a fix for fontconfig.pc.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/fbterm/fbterm.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
index 712d4f97fa..9964827801 100644
--- a/package/fbterm/fbterm.mk
+++ b/package/fbterm/fbterm.mk
@@ -10,12 +10,6 @@ FBTERM_LICENSE = GPL-2.0+
FBTERM_LICENSE_FILES = COPYING
FBTERM_DEPENDENCIES = fontconfig liberation
-ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
-# fontconfig uses pthreads if available, but fbterm forgets to link
-# with it breaking static builds
-FBTERM_CONF_ENV += LIBS='-lpthread'
-endif
-
ifeq ($(BR2_PACKAGE_GPM),y)
FBTERM_DEPENDENCIES += gpm
FBTERM_CONF_OPTS += --enable-gpm
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-20 11:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-20 11:22 [Buildroot] [PATCH 1/2] package/fontconfig: add pthread as a dependency of a static lib Bernd Kuhls
2020-09-20 11:22 ` [Buildroot] [PATCH 2/2] package/fbterm: remove fontconfig fix Bernd Kuhls
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.