libs/icu: Correctly handle CURR_FULL_DIR when cross compiling

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

7 files changed, 39 insertions, 24 deletions

diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 488b12bd89d..7e5fd3c19cf 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapted to the ICU 4.6 distribution.
+
 2010-04-08  Karl Berry  <karl@tug.org>
 
 	* configure.ac: Pass new option --disable-utf16-string-check.
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
index a817b1bde4d..b90685be95a 100644
--- a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-11-CURR_FULL_DIR: Correctly handle CURR_FULL_DIR when
+	cross compiling.
+
 2010-12-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported icu-4.6 source tree (icu4c-4_6-src.tgz) from:
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR b/Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR
index 9cc86d81670..76e60b8ea45 100644
--- a/Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR
@@ -1,24 +1,27 @@
-	For a cross compilation Unix => mingw we certainly can't have this.
-	This is just a minimal fix to build static libraries, but certainly
-	not sufficient for icu-config.
+	When cross compiling, e.g., Unix => mingw CURR_FULL_DIR must
+	certainly be that for the native (Unix) system and not that for
+	the build (mingw) system.
 
-	The whole scheme is broken for cross compilation, where
-	CURR_FULL_DIR and CURR_SRCCODE_FULL_DIR should come from
-	the native configuration of the build system.
-
-diff -ur icu-4.6.orig/source/config/mh-mingw icu-4.6/source/config/mh-mingw
---- icu-4.6.orig/source/config/mh-mingw	2009-03-30 18:24:17.000000000 +0200
-+++ icu-4.6/source/config/mh-mingw	2010-12-02 15:01:44.000000000 +0100
-@@ -72,10 +72,10 @@
- # The #M# is used to delete lines for icu-config
+diff -ur icu-4.6.orig/source/Makefile.in icu-4.6/source/Makefile.in
+--- icu-4.6.orig/source/Makefile.in	2010-10-07 02:23:38.000000000 +0200
++++ icu-4.6/source/Makefile.in	2010-12-07 09:13:47.000000000 +0100
+@@ -208,6 +208,8 @@
+ config/icucross.mk: $(top_builddir)/icudefs.mk  $(top_builddir)/Makefile
+	@echo rebuilding $@
+ 	@(echo "CROSS_ICU_VERSION=$(VERSION)" ;\
++	  grep '^CURR_FULL_DIR' $(top_builddir)/icudefs.mk ;\
++	  grep '^CURR_FULL_DIR' @platform_make_fragment@ ;\
+ 	  echo "TOOLEXEEXT=$(EXEEXT)" \
+ 	   ) > $@
+ 	@(echo 'TOOLBINDIR=$$(cross_buildroot)/bin' ;\
+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-10-05 01:55:47.000000000 +0200
++++ icu-4.6/source/icudefs.mk.in	2010-12-06 20:26:34.000000000 +0100
+@@ -220,6 +220,7 @@
+ TOOLBINDIR=$(BINDIR)
+ TOOLLIBDIR=$(LIBDIR)
+ 
++# overridden by icucross.mk and maybe by config/mh-*.
  # Current full path directory.
- #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
--CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
-+#CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+ CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
  # Current full path directory for use in source code in a -D compiler option.
- #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
--CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
-+#CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
- 
- ## Compilation rules
- %.$(STATIC_O): $(srcdir)/%.c
diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/patch-12-mingw b/Build/source/libs/icu/icu-4.6-PATCHES/patch-12-mingw
index 25b60e9f609..8f87d40bb2d 100644
--- a/Build/source/libs/icu/icu-4.6-PATCHES/patch-12-mingw
+++ b/Build/source/libs/icu/icu-4.6-PATCHES/patch-12-mingw
@@ -1,7 +1,7 @@
 	We don't want this for TeX Live cross compilation.
 
 diff -ur icu-4.6.orig/source/config/mh-mingw icu-4.6/source/config/mh-mingw
---- icu-4.6.orig/source/config/mh-mingw	2010-12-02 15:01:44.000000000 +0100
+--- icu-4.6.orig/source/config/mh-mingw	2009-03-30 18:24:17.000000000 +0200
 +++ icu-4.6/source/config/mh-mingw	2010-12-02 15:06:16.000000000 +0100
 @@ -52,21 +52,10 @@
  SO = dll
diff --git a/Build/source/libs/icu/icu-4.6/Makefile.in b/Build/source/libs/icu/icu-4.6/Makefile.in
index fa94c48449c..1f8298c0160 100644
--- a/Build/source/libs/icu/icu-4.6/Makefile.in
+++ b/Build/source/libs/icu/icu-4.6/Makefile.in
@@ -208,6 +208,8 @@ icudefs.mk: $(srcdir)/icudefs.mk.in  $(top_builddir)/config.status
 config/icucross.mk: $(top_builddir)/icudefs.mk  $(top_builddir)/Makefile
 	@echo rebuilding $@
 	@(echo "CROSS_ICU_VERSION=$(VERSION)" ;\
+	  grep '^CURR_FULL_DIR' $(top_builddir)/icudefs.mk ;\
+	  grep '^CURR_FULL_DIR' @platform_make_fragment@ ;\
 	  echo "TOOLEXEEXT=$(EXEEXT)" \
 	   ) > $@
 	@(echo 'TOOLBINDIR=$$(cross_buildroot)/bin' ;\
diff --git a/Build/source/libs/icu/icu-4.6/config/mh-mingw b/Build/source/libs/icu/icu-4.6/config/mh-mingw
index 6a68c449f4f..e2c86a1c573 100644
--- a/Build/source/libs/icu/icu-4.6/config/mh-mingw
+++ b/Build/source/libs/icu/icu-4.6/config/mh-mingw
@@ -61,10 +61,10 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
 # The #M# is used to delete lines for icu-config
 # Current full path directory.
 #CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
-#CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
 # Current full path directory for use in source code in a -D compiler option.
 #CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M# for MSYS
-#CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
 
 ## Compilation rules
 %.$(STATIC_O): $(srcdir)/%.c
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 a6923e32fac..3cabcdbbc7a 100644
--- a/Build/source/libs/icu/icu-4.6/icudefs.mk.in
+++ b/Build/source/libs/icu/icu-4.6/icudefs.mk.in
@@ -220,6 +220,7 @@ BINDIR=$(top_builddir)/bin
 TOOLBINDIR=$(BINDIR)
 TOOLLIBDIR=$(LIBDIR)
 
+# overridden by icucross.mk and maybe by config/mh-*.
 # Current full path directory.
 CURR_FULL_DIR=$(shell pwd | sed 's/ /\\ /g')
 # Current full path directory for use in source code in a -D compiler option.