From ab160e31616b81a64f079277b452f8c73f0f6994 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Apr 2017 21:37:36 +0000 Subject: 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 --- Build/source/libs/harfbuzz/Makefile.am | 2 +- Build/source/libs/harfbuzz/Makefile.in | 2 +- Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am | 4 ++-- Build/source/texk/bibtex-x/Makefile.am | 2 +- Build/source/texk/bibtex-x/Makefile.in | 2 +- Build/source/texk/upmendex/Makefile.am | 2 +- Build/source/texk/upmendex/Makefile.in | 2 +- Build/source/texk/web2c/Makefile.in | 5 +++-- Build/source/texk/web2c/xetexdir/am/xetex.am | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) (limited to 'Build') 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 diff --git a/Build/source/texk/bibtex-x/Makefile.am b/Build/source/texk/bibtex-x/Makefile.am index 9ee3fe6ff12..6cbb6068e67 100644 --- a/Build/source/texk/bibtex-x/Makefile.am +++ b/Build/source/texk/bibtex-x/Makefile.am @@ -42,7 +42,7 @@ bibtexu_SOURCES = $(common_sources) nodist_EXTRA_bibtexu_SOURCES = dummy.cxx bibtexu_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_INCLUDES) -DUTF_8 $(bibtexu_OBJECTS): $(KPATHSEA_DEPEND) $(ICU_DEPEND) -bibtexu_LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) +bibtexu_LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) $(ICU_LIBS_EXTRA) ## Rebuild libkpathsea @KPATHSEA_RULE@ diff --git a/Build/source/texk/bibtex-x/Makefile.in b/Build/source/texk/bibtex-x/Makefile.in index 22a24b02150..e0fb57ec0f9 100644 --- a/Build/source/texk/bibtex-x/Makefile.in +++ b/Build/source/texk/bibtex-x/Makefile.in @@ -613,7 +613,7 @@ bibtexu_SOURCES = $(common_sources) # Force Automake to use CXXLD for linking nodist_EXTRA_bibtexu_SOURCES = dummy.cxx bibtexu_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_INCLUDES) -DUTF_8 -bibtexu_LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) +bibtexu_LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) $(ICU_LIBS_EXTRA) csfdir = $(datarootdir)/texmf-dist/bibtex/csf/base dist_csf_DATA = \ csf/88591lat.csf \ diff --git a/Build/source/texk/upmendex/Makefile.am b/Build/source/texk/upmendex/Makefile.am index 78765255f9c..47641c00683 100644 --- a/Build/source/texk/upmendex/Makefile.am +++ b/Build/source/texk/upmendex/Makefile.am @@ -35,7 +35,7 @@ nodist_EXTRA_upmendex_SOURCES = dummy.cxx $(upmendex_OBJECTS): $(KPATHSEA_DEPEND) $(ICU_DEPEND) -LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) +LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) $(ICU_LIBS_EXTRA) ## Rebuild libkpathsea @KPATHSEA_RULE@ diff --git a/Build/source/texk/upmendex/Makefile.in b/Build/source/texk/upmendex/Makefile.in index 183e90d0aef..81ae1182fd9 100644 --- a/Build/source/texk/upmendex/Makefile.in +++ b/Build/source/texk/upmendex/Makefile.in @@ -595,7 +595,7 @@ upmendex_SOURCES = \ # Force Automake to use CXXLD for linking nodist_EXTRA_upmendex_SOURCES = dummy.cxx -LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) +LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) $(ICU_LIBS_EXTRA) EXTRA_DIST = COPYRIGHT indexsty upmendex.doc $(TESTS) tests/foo.idx \ tests/foo.ind tests/uni.idx tests/uni.dict tests/uni.ist \ tests/uni.ind diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 0b38a964380..d9959296b25 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -3557,8 +3557,9 @@ xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_97) \ $(am__append_98) xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \ - $(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \ - $(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a $(am__append_99) + $(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(POPPLER_LIBS) \ + $(LIBPNG_LIBS) $(FREETYPE2_LIBS) $(ZLIB_LIBS) libmd5.a \ + $(am__append_99) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \ $(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \ diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 475f8dc44bc..7fa327c8e82 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -33,7 +33,7 @@ xetex_cppflags += -I$(srcdir)/libmd5 xetex_ldadd = $(libxetex) xetex_ldadd += $(HARFBUZZ_LIBS) xetex_ldadd += $(GRAPHITE2_LIBS) -xetex_ldadd += $(ICU_LIBS) +xetex_ldadd += $(ICU_LIBS) $(ICU_LIBS_EXTRA) xetex_ldadd += $(TECKIT_LIBS) xetex_ldadd += $(POPPLER_LIBS) xetex_ldadd += $(LIBPNG_LIBS) -- cgit v1.2.3