texlive[44041] Build/source: add ICU_LIBS_EXTRA wherever there was

commits+karl at tug.org commits+karl at tug.org
Tue Apr 25 23:37:36 CEST 2017 

Revision: 44041
          http://tug.org/svn/texlive?view=revision&revision=44041
Author:   karl
Date:     2017-04-25 23:37:36 +0200 (Tue, 25 Apr 2017)
Log Message:
-----------
add ICU_LIBS_EXTRA wherever there was ICU_LIBS, for -lpthreads placation

Modified Paths:
--------------
    trunk/Build/source/libs/harfbuzz/Makefile.am
    trunk/Build/source/libs/harfbuzz/Makefile.in
    trunk/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am
    trunk/Build/source/texk/bibtex-x/Makefile.am
    trunk/Build/source/texk/bibtex-x/Makefile.in
    trunk/Build/source/texk/upmendex/Makefile.am
    trunk/Build/source/texk/upmendex/Makefile.in
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/xetexdir/am/xetex.am

Modified: trunk/Build/source/libs/harfbuzz/Makefile.am
===================================================================
--- trunk/Build/source/libs/harfbuzz/Makefile.am	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/libs/harfbuzz/Makefile.am	2017-04-25 21:37:36 UTC (rev 44041)
@@ -149,7 +149,7 @@
 
 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@

Modified: trunk/Build/source/libs/harfbuzz/Makefile.in
===================================================================
--- trunk/Build/source/libs/harfbuzz/Makefile.in	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/libs/harfbuzz/Makefile.in	2017-04-25 21:37:36 UTC (rev 44041)
@@ -738,7 +738,7 @@
 # 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)

Modified: trunk/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am
===================================================================
--- trunk/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/libs/harfbuzz/harfbuzz-src/src/Makefile.am	2017-04-25 21:37:36 UTC (rev 44041)
@@ -151,7 +151,7 @@
 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 @@
 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

Modified: trunk/Build/source/texk/bibtex-x/Makefile.am
===================================================================
--- trunk/Build/source/texk/bibtex-x/Makefile.am	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/texk/bibtex-x/Makefile.am	2017-04-25 21:37:36 UTC (rev 44041)
@@ -42,7 +42,7 @@
 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@

Modified: trunk/Build/source/texk/bibtex-x/Makefile.in
===================================================================
--- trunk/Build/source/texk/bibtex-x/Makefile.in	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/texk/bibtex-x/Makefile.in	2017-04-25 21:37:36 UTC (rev 44041)
@@ -613,7 +613,7 @@
 # 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 \

Modified: trunk/Build/source/texk/upmendex/Makefile.am
===================================================================
--- trunk/Build/source/texk/upmendex/Makefile.am	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/texk/upmendex/Makefile.am	2017-04-25 21:37:36 UTC (rev 44041)
@@ -35,7 +35,7 @@
 
 $(upmendex_OBJECTS): $(KPATHSEA_DEPEND) $(ICU_DEPEND)
 
-LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS)
+LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) $(ICU_LIBS_EXTRA)
 
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@

Modified: trunk/Build/source/texk/upmendex/Makefile.in
===================================================================
--- trunk/Build/source/texk/upmendex/Makefile.in	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/texk/upmendex/Makefile.in	2017-04-25 21:37:36 UTC (rev 44041)
@@ -595,7 +595,7 @@
 
 # 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

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/texk/web2c/Makefile.in	2017-04-25 21:37:36 UTC (rev 44041)
@@ -3557,8 +3557,9 @@
 	$(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) \

Modified: trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/am/xetex.am	2017-04-25 21:33:02 UTC (rev 44040)
+++ trunk/Build/source/texk/web2c/xetexdir/am/xetex.am	2017-04-25 21:37:36 UTC (rev 44041)
@@ -33,7 +33,7 @@
 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)

More information about the tex-live-commits mailing list