1*4882a593SmuzhiyunFrom 40ec04a8bf36dd8d0aa3da98b167792ce2dcd114 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Silvan Scherrer <silvan.scherrer@aroa.ch> 3*4882a593SmuzhiyunDate: Sun, 20 Sep 2020 12:52:08 +0200 4*4882a593SmuzhiyunSubject: [PATCH] add pthread as a dependency of a static lib 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDownloaded from https://trac.netlabs.org/ports/changeset/2220 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunPatch sent upstream: 9*4882a593Smuzhiyunhttps://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun configure.ac | 2 ++ 14*4882a593Smuzhiyun fontconfig.pc.in | 4 ++-- 15*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 2 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 18*4882a593Smuzhiyunindex f3189a7..594d6fd 100644 19*4882a593Smuzhiyun--- a/configure.ac 20*4882a593Smuzhiyun+++ b/configure.ac 21*4882a593Smuzhiyun@@ -690,6 +690,8 @@ fi 22*4882a593Smuzhiyun have_pthread=false 23*4882a593Smuzhiyun if test "$os_win32" = no; then 24*4882a593Smuzhiyun AX_PTHREAD([have_pthread=true]) 25*4882a593Smuzhiyun+ AC_SUBST(PTHREAD_CFLAGS) 26*4882a593Smuzhiyun+ AC_SUBST(PTHREAD_LIBS) 27*4882a593Smuzhiyun fi 28*4882a593Smuzhiyun if $have_pthread; then 29*4882a593Smuzhiyun LIBS="$PTHREAD_LIBS $LIBS" 30*4882a593Smuzhiyundiff --git a/fontconfig.pc.in b/fontconfig.pc.in 31*4882a593Smuzhiyunindex 61b35fb..f823bac 100644 32*4882a593Smuzhiyun--- a/fontconfig.pc.in 33*4882a593Smuzhiyun+++ b/fontconfig.pc.in 34*4882a593Smuzhiyun@@ -14,5 +14,5 @@ Version: @VERSION@ 35*4882a593Smuzhiyun Requires: @PKGCONFIG_REQUIRES@ 36*4882a593Smuzhiyun Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@ 37*4882a593Smuzhiyun Libs: -L${libdir} -lfontconfig 38*4882a593Smuzhiyun-Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ 39*4882a593Smuzhiyun-Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ 40*4882a593Smuzhiyun+Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ @PTHREAD_LIBS@ 41*4882a593Smuzhiyun+Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ @PTHREAD_CFLAGS@ 42*4882a593Smuzhiyun-- 43*4882a593Smuzhiyun2.27.0 44*4882a593Smuzhiyun 45