build system fixes, mostly for mingw32 cross and win32

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

9 files changed, 87 insertions, 15 deletions

diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 2dd57fca383..ce1923efde8 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Pass '--disable-strict' to ICU configure:
+	required for MinGW32, otherwise maybe reduced warnings.
+
 2009-12-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Replace the obsolete $(mkdir_p) by $(MKDIR_P).
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index 5b041c5f415..a5396e269f8 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -2343,6 +2343,8 @@ icu_config="$icu_config --disable-extras --disable-samples --disable-tests"
 if test "x$cache_file" != x/dev/null; then
   icu_config="$icu_config -C"
 fi
+# Required for MinGW32, otherwise reduced warnings.
+icu_config="$icu_config --disable-strict"
 
 
 if test "x$cross_compiling" = xyes; then
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index 233bc0d9295..bc9997b711b 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -33,6 +33,8 @@ icu_config="$icu_config --disable-extras --disable-samples --disable-tests"
 if test "x$cache_file" != x/dev/null; then
   icu_config="$icu_config -C"
 fi
+# Required for MinGW32, otherwise reduced warnings.
+icu_config="$icu_config --disable-strict"
 AC_SUBST([icu_config])
 
 if test "x$cross_compiling" = xyes; then
diff --git a/Build/source/libs/icu/icu-4.2.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.2.1-PATCHES/ChangeLog
index 359bd8c440a..37c86967e8a 100644
--- a/Build/source/libs/icu/icu-4.2.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-4.2.1-PATCHES/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Fixes for Linux => MinGW32 cross compilation.
+	* patch-10-cross-TOOLEXEEXT (new): Fix a cross compilation typo.
+	* patch-11-CURR_FULL_DIR (new): Fix for cross compilation on
+	a Unix like system.  Does MinGW32 have pwd?
+	* patch-12-mingw (new): Changes in config/mh-mingw (libraries
+	named as for everyone else).
+
 2009-10-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-09-cross (new): Modify AC_CHECK_64BIT_LIBS in aclocal.m4
diff --git a/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-10-cross-TOOLEXEEXT b/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-10-cross-TOOLEXEEXT
new file mode 100644
index 00000000000..d8eecd04b71
--- /dev/null
+++ b/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-10-cross-TOOLEXEEXT
@@ -0,0 +1,14 @@
+	This must, of course, be TOOLEXEEXT and not EXEEXT.
+
+diff -ur icu-4.2.1.orig/data/Makefile.in icu-4.2.1/data/Makefile.in
+--- icu-4.2.1.orig/data/Makefile.in	2009-10-26 12:10:19.000000000 +0100
++++ icu-4.2.1/data/Makefile.in	2010-02-22 21:59:13.005082641 +0100
+@@ -470,7 +470,7 @@
+ #          The $(word n, ...) selects the nth word from the following stuff.
+ #          There must be a nicer way to do this.
+ 
+-$(CFU_FILES): $(ALL_CFU_SOURCE) $(TOOLBINDIR)/gencfu$(EXEEXT) $(DAT_FILES)
++$(CFU_FILES): $(ALL_CFU_SOURCE) $(TOOLBINDIR)/gencfu$(TOOLEXEEXT) $(DAT_FILES)
+ 	$(INVOKE) echo ALL_CFU_SOURCE: $(ALL_CFU_SOURCE)
+ 	$(INVOKE) echo CFU_FILES: $(CFU_FILES)
+ 	$(INVOKE) echo CFU_FILES_SHORT: $(CFU_FILES_SHORT)
diff --git a/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-11-CURR_FULL_DIR b/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-11-CURR_FULL_DIR
new file mode 100644
index 00000000000..fae0e2abb1a
--- /dev/null
+++ b/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-11-CURR_FULL_DIR
@@ -0,0 +1,24 @@
+	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.
+
+	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.2.1.orig/config/mh-mingw icu-4.2.1/config/mh-mingw
+--- icu-4.2.1.orig/config/mh-mingw	2009-07-01 20:50:48.000000000 +0200
++++ icu-4.2.1/config/mh-mingw	2010-02-22 22:57:21.758699124 +0100
+@@ -72,10 +72,10 @@
+ # 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.2.1-PATCHES/patch-12-mingw b/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-12-mingw
new file mode 100644
index 00000000000..e67ee480b7a
--- /dev/null
+++ b/Build/source/libs/icu/icu-4.2.1-PATCHES/patch-12-mingw
@@ -0,0 +1,27 @@
+	We don't want this for TeX Live cross compilation.
+
+diff -ur icu-4.2.1.orig/config/mh-mingw icu-4.2.1/config/mh-mingw
+--- icu-4.2.1.orig/config/mh-mingw	2010-02-22 22:57:21.000000000 +0100
++++ icu-4.2.1/config/mh-mingw	2010-02-22 23:06:27.603193612 +0100
+@@ -52,21 +52,10 @@
+ SO = dll
+ ## Non-shared intermediate object suffix
+ STATIC_O = ao
+-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
+-
+-# Static library prefix and file extension
+-LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
+-A = lib
+ 
+ ## An import library is needed for z/OS and MSVC
+ #IMPORT_LIB_EXT = .lib
+ 
+-LIBPREFIX=
+-
+-# Change the stubnames so that poorly working FAT disks and installation programs can work.
+-# This is also for backwards compatibility.
+-DATA_STUBNAME = dt
+-I18N_STUBNAME = in
+ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
+ 
+ # The #M# is used to delete lines for icu-config
diff --git a/Build/source/libs/icu/icu-4.2.1/config/mh-mingw b/Build/source/libs/icu/icu-4.2.1/config/mh-mingw
index a79e3d7ec14..6a68c449f4f 100644
--- a/Build/source/libs/icu/icu-4.2.1/config/mh-mingw
+++ b/Build/source/libs/icu/icu-4.2.1/config/mh-mingw
@@ -52,30 +52,19 @@ LD_SONAME =
 SO = dll
 ## Non-shared intermediate object suffix
 STATIC_O = ao
-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
-
-# Static library prefix and file extension
-LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
-A = lib
 
 ## An import library is needed for z/OS and MSVC
 #IMPORT_LIB_EXT = .lib
 
-LIBPREFIX=
-
-# Change the stubnames so that poorly working FAT disks and installation programs can work.
-# This is also for backwards compatibility.
-DATA_STUBNAME = dt
-I18N_STUBNAME = in
 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.2.1/data/Makefile.in b/Build/source/libs/icu/icu-4.2.1/data/Makefile.in
index 7e624030059..520dc3e69d8 100644
--- a/Build/source/libs/icu/icu-4.2.1/data/Makefile.in
+++ b/Build/source/libs/icu/icu-4.2.1/data/Makefile.in
@@ -470,7 +470,7 @@ $(BRKBLDDIR)/%.ctd: $(BRKSRCDIR)/%.txt $(TOOLBINDIR)/genctd$(TOOLEXEEXT) $(DAT_F
 #          The $(word n, ...) selects the nth word from the following stuff.
 #          There must be a nicer way to do this.
 
-$(CFU_FILES): $(ALL_CFU_SOURCE) $(TOOLBINDIR)/gencfu$(EXEEXT) $(DAT_FILES)
+$(CFU_FILES): $(ALL_CFU_SOURCE) $(TOOLBINDIR)/gencfu$(TOOLEXEEXT) $(DAT_FILES)
 	$(INVOKE) echo ALL_CFU_SOURCE: $(ALL_CFU_SOURCE)
 	$(INVOKE) echo CFU_FILES: $(CFU_FILES)
 	$(INVOKE) echo CFU_FILES_SHORT: $(CFU_FILES_SHORT)