diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-12-07 09:19:15 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-12-07 09:19:15 +0000 |
commit | 6c6c4ea8f6caf172c2bd0f656ab7b232e03a20ac (patch) | |
tree | 59b0a7c9cd92a75e1bb1f153437c442b7d60c1af /Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR | |
parent | 128ef532938e461d836f47e00a93a444c1475a4f (diff) |
libs/icu: Correctly handle CURR_FULL_DIR when cross compiling
git-svn-id: svn://tug.org/texlive/trunk@20672 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR')
-rw-r--r-- | Build/source/libs/icu/icu-4.6-PATCHES/patch-11-CURR_FULL_DIR | 45 |
1 files changed, 24 insertions, 21 deletions
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 |