0002-add-pthread-as-a-dependency-of-a-static-lib.patch 1.4 KB

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