icu build: Always use libicuxxx, not libsicuxxx

git-svn-id: svn://tug.org/texlive/trunk@22373 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 39 insertions, 24 deletions

diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index 2dc2aef28bb..8c62081cec2 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -1,6 +1,6 @@
 ## Proxy Makefile.am to build ICU for TeX Live.
 ##
-##   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -63,19 +63,6 @@ if cross
 	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 endif cross
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
-## For ICU versions <= 4.2.1, the static libraries were called
-## libsicuxxx.a, but this is not longer generally true for ICU 4.4.
-## In order to have uniform LDFLAGS, we therefore create symlinks
-## libsicuxxx.a -> libicuxxx.a as required.
-## Can't do this the other way around, because for AIX shared and
-## and static libraries both have the extension '.a'.
-	@cd icu-build/lib && for lib in libicu*.a; do \
-	  test -f "$$lib" || continue; \
-	  libs=`echo "$$lib" | sed 's/libicu/libsicu/'`; \
-	  test -f "$$libs" && continue; \
-	  echo "creating link '$$libs' -> '$$lib'"; \
-	  $(LN_S) "$$lib" "$$libs" || exit 1; \
-	done
 
 check-makeflags:
 	@for f in x $$MAKEFLAGS; do \
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 84b5ba4c3e7..46119ee7146 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -705,13 +705,6 @@ icu-native/Makefile:
 icubuild: icu-build/Makefile check-makeflags
 @cross_TRUE@	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
-	@cd icu-build/lib && for lib in libicu*.a; do \
-	  test -f "$$lib" || continue; \
-	  libs=`echo "$$lib" | sed 's/libicu/libsicu/'`; \
-	  test -f "$$libs" && continue; \
-	  echo "creating link '$$libs' -> '$$lib'"; \
-	  $(LN_S) "$$lib" "$$libs" || exit 1; \
-	done
 
 check-makeflags:
 	@for f in x $$MAKEFLAGS; do \
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
index ee51d729ad5..ba33e72dde8 100644
--- a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-13-STATIC_PREFIX (new): Never use libsicuxxx.a.
+
 2011-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-81-Indic (new): IndicReordering.*: Respect array bounds.
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/patch-13-STATIC_PREFIX b/Build/source/libs/icu/icu-4.6-PATCHES/patch-13-STATIC_PREFIX
new file mode 100644
index 00000000000..7eaf45a4e4b
--- /dev/null
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/patch-13-STATIC_PREFIX
@@ -0,0 +1,31 @@
+diff -ur icu-4.6.orig/source/config/Makefile.inc.in icu-4.6/source/config/Makefile.inc.in
+--- icu-4.6.orig/source/config/Makefile.inc.in	2010-06-17 21:50:26.000000000 +0200
++++ icu-4.6/source/config/Makefile.inc.in	2011-05-09 10:01:44.000000000 +0200
+@@ -44,7 +44,7 @@
+ LIBICU = lib$(ICUPREFIX)
+ 
+ # Static library prefix and file extension
+-STATIC_PREFIX = s
++STATIC_PREFIX =
+ LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ 
+diff -ur icu-4.6.orig/source/icudefs.mk.in icu-4.6/source/icudefs.mk.in
+--- icu-4.6.orig/source/icudefs.mk.in	2010-12-06 20:26:34.000000000 +0100
++++ icu-4.6/source/icudefs.mk.in	2011-05-09 10:15:44.000000000 +0200
+@@ -189,13 +189,13 @@
+ 
+ ## If we can't use the shared libraries, use the static libraries
+ ifneq ($(ENABLE_SHARED),YES)
+-STATIC_PREFIX_WHEN_USED = s
++STATIC_PREFIX_WHEN_USED =
+ else
+ STATIC_PREFIX_WHEN_USED = 
+ endif
+ 
+ # Static library prefix and file extension
+-STATIC_PREFIX = s
++STATIC_PREFIX =
+ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+ A = a
+ SOBJ = $(SO)
diff --git a/Build/source/libs/icu/icu-4.6/config/Makefile.inc.in b/Build/source/libs/icu/icu-4.6/config/Makefile.inc.in
index 773a4bd4354..8a2080e1259 100644
--- a/Build/source/libs/icu/icu-4.6/config/Makefile.inc.in
+++ b/Build/source/libs/icu/icu-4.6/config/Makefile.inc.in
@@ -44,7 +44,7 @@ PACKAGE = @PACKAGE@
 LIBICU = lib$(ICUPREFIX)
 
 # Static library prefix and file extension
-STATIC_PREFIX = s
+STATIC_PREFIX =
 LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
 A = a
 
diff --git a/Build/source/libs/icu/icu-4.6/icudefs.mk.in b/Build/source/libs/icu/icu-4.6/icudefs.mk.in
index 3cabcdbbc7a..37c6752ec49 100644
--- a/Build/source/libs/icu/icu-4.6/icudefs.mk.in
+++ b/Build/source/libs/icu/icu-4.6/icudefs.mk.in
@@ -189,13 +189,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
 
 ## If we can't use the shared libraries, use the static libraries
 ifneq ($(ENABLE_SHARED),YES)
-STATIC_PREFIX_WHEN_USED = s
+STATIC_PREFIX_WHEN_USED =
 else
 STATIC_PREFIX_WHEN_USED = 
 endif
 
 # Static library prefix and file extension
-STATIC_PREFIX = s
+STATIC_PREFIX =
 LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
 A = a
 SOBJ = $(SO)