diff options
| author | Karl Berry <karl@freefriends.org> | 2017-04-25 21:37:36 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-04-25 21:37:36 +0000 |
| commit | ab160e31616b81a64f079277b452f8c73f0f6994 (patch) | |
| tree | de410e85803f567509439bad805b31b215e5e4fe /Build/source/libs/harfbuzz | |
| parent | f009f3f8b6f440a339965588149331b3943d40f5 (diff) | |
add ICU_LIBS_EXTRA wherever there was ICU_LIBS, for -lpthreads placation
git-svn-id: svn://tug.org/texlive/trunk@44041 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz')
| -rw-r--r-- | Build/source/libs/harfbuzz/Makefile.am | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am index e48a9e1a3d0..20db1260d2b 100644 --- a/Build/source/libs/harfbuzz/Makefile.am +++ b/Build/source/libs/harfbuzz/Makefile.am @@ -149,7 +149,7 @@ nodist_EXTRA_hbtest_SOURCES = dummy.cxx hbtest_CPPFLAGS = -Iinclude $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES) -LDADD = libharfbuzz.a $(ICU_LIBS) $(GRAPHITE2_LIBS) +LDADD = libharfbuzz.a $(ICU_LIBS) $(ICU_LIBS_EXTRA) $(GRAPHITE2_LIBS) ## Rebuild libsicuxxx @ICU_RULE@ diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in index be72594a66d..b93ab3808dc 100644 --- a/Build/source/libs/harfbuzz/Makefile.in +++ b/Build/source/libs/harfbuzz/Makefile.in @@ -738,7 +738,7 @@ hbtest_SOURCES = hbtest.c # Force Automake to use CXXLD for linking nodist_EXTRA_hbtest_SOURCES = dummy.cxx hbtest_CPPFLAGS = -Iinclude $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES) -LDADD = libharfbuzz.a $(ICU_LIBS) $(GRAPHITE2_LIBS) +LDADD = libharfbuzz.a $(ICU_LIBS) $(ICU_LIBS_EXTRA) $(GRAPHITE2_LIBS) # Reconfig reconfig_prereq = $(libharfbuzz_dependencies) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am index 0c077d99013..958972a1445 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am @@ -151,7 +151,7 @@ CLEANFILES += libharfbuzz-fuzzing.la if HAVE_ICU if HAVE_ICU_BUILTIN HBCFLAGS += $(ICU_CFLAGS) -HBLIBS += $(ICU_LIBS) +HBLIBS += $(ICU_LIBS) $(ICU_LIBS_EXTRA) HBSOURCES += $(HB_ICU_sources) HBHEADERS += $(HB_ICU_headers) else @@ -159,7 +159,7 @@ lib_LTLIBRARIES += libharfbuzz-icu.la libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources) libharfbuzz_icu_la_CPPFLAGS = $(ICU_CFLAGS) libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined -libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la +libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) $(ICU_LIBS_EXTRA) libharfbuzz.la pkginclude_HEADERS += $(HB_ICU_headers) pkgconfig_DATA += harfbuzz-icu.pc endif |