Blame SOURCES/icu4c-56_1-crossbuild.patch

63ae99
--- icu/source/config/icu-config-bottom	2015-10-08 05:54:30.000000000 +0200
63ae99
+++ icu/source/config/icu-config-bottom	2016-06-07 16:28:42.861210723 +0200
63ae99
@@ -3,7 +3,7 @@
63ae99
 ## Copyright (c) 2002-2013, International Business Machines Corporation and
63ae99
 ## others. All Rights Reserved.
63ae99
 
63ae99
-ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}"
63ae99
+ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}"
63ae99
 ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}"
63ae99
 
63ae99
 #  echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
63ae99
--- icu/source/config/icu.pc.in	2015-10-08 05:54:32.000000000 +0200
63ae99
+++ icu/source/config/icu.pc.in	2016-06-07 16:28:42.861210723 +0200
63ae99
@@ -1,30 +1,30 @@
63ae99
 # Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved.
63ae99
 
63ae99
 # CFLAGS contains only anything end users should set
63ae99
-CFLAGS = @UCONFIG_CFLAGS@
63ae99
+CFLAGS=@UCONFIG_CFLAGS@
63ae99
 # CXXFLAGS contains only anything end users should set
63ae99
-CXXFLAGS = @UCONFIG_CXXFLAGS@
63ae99
+CXXFLAGS=@UCONFIG_CXXFLAGS@
63ae99
 # DEFS only contains those UCONFIG_CPPFLAGS which are not auto-set by platform.h
63ae99
-DEFS = @UCONFIG_CPPFLAGS@
63ae99
-prefix = @prefix@
63ae99
-exec_prefix = @exec_prefix@
63ae99
-#bindir = @bindir@
63ae99
-libdir = @libdir@
63ae99
-includedir = @includedir@
63ae99
-baselibs = @LIBS@
63ae99
-#datarootdir = @datarootdir@
63ae99
-#datadir = @datadir@
63ae99
-#sbindir = @sbindir@
63ae99
-#mandir = @mandir@
63ae99
-#sysconfdir = @sysconfdir@
63ae99
+DEFS=@UCONFIG_CPPFLAGS@
63ae99
+prefix=@prefix@
63ae99
+exec_prefix=@exec_prefix@
63ae99
+#bindir=@bindir@
63ae99
+libdir=@libdir@
63ae99
+includedir=@includedir@
63ae99
+baselibs=@LIBS@
63ae99
+#datarootdir=@datarootdir@
63ae99
+#datadir=@datadir@
63ae99
+#sbindir=@sbindir@
63ae99
+#mandir=@mandir@
63ae99
+#sysconfdir=@sysconfdir@
63ae99
 UNICODE_VERSION=@UNICODE_VERSION@
63ae99
 ICUPREFIX=icu
63ae99
 ICULIBSUFFIX=@ICULIBSUFFIX@
63ae99
-LIBICU=lib${ICUPREFIX}
63ae99
+LIBICU=${ICUPREFIX}
63ae99
 #SHAREDLIBCFLAGS=-fPIC
63ae99
 pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@
63ae99
 #pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@
63ae99
-ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@
63ae99
+ICUDATA_NAME=icudata@LIB_VERSION_MAJOR@@ICUDATA_CHAR@
63ae99
 #ICUPKGDATA_DIR=@libdir@
63ae99
 #ICUDATA_DIR=${pkgdatadir}
63ae99
 ICUDESC=International Components for Unicode
63ae99
--- icu/source/config/Makefile.inc.in	2015-10-08 05:54:32.000000000 +0200
63ae99
+++ icu/source/config/Makefile.inc.in	2016-06-07 16:28:42.861210723 +0200
63ae99
@@ -41,7 +41,7 @@
63ae99
 # The prefix for ICU libraries, normally 'icu'
63ae99
 ICUPREFIX = icu
63ae99
 PACKAGE = @PACKAGE@
63ae99
-LIBICU = lib$(ICUPREFIX)
63ae99
+LIBICU = $(ICUPREFIX)
63ae99
 
63ae99
 # Static library prefix and file extension
63ae99
 STATIC_PREFIX = s
63ae99
@@ -106,18 +106,19 @@
63ae99
 #    - $(ICULIBS_LAYOUT)  - ICU layout library. 
63ae99
 #    - $(ICULIBS_ICUIO)   - ICU stdio equivalent library
63ae99
 
63ae99
-ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_DATA   = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_I18N   = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
-ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
63ae99
+ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)
63ae99
+ICULIBS_DATA   = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_I18N   = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)
63ae99
+ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
63ae99
+ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)
63ae99
+ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)
63ae99
+ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)
63ae99
+ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)
63ae99
 ICULIBS_BASE = -L$(libdir)
63ae99
 
63ae99
 # for icu-config to test with
63ae99
+SO = dll
63ae99
 ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
63ae99
 ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
63ae99
 
63ae99
--- icu/source/config/mh-mingw	2015-10-08 05:54:32.000000000 +0200
63ae99
+++ icu/source/config/mh-mingw	2016-06-07 16:30:24.974945050 +0200
63ae99
@@ -66,7 +66,7 @@
63ae99
 endif
63ae99
 
63ae99
 # Static library prefix and file extension
63ae99
-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
63ae99
+LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX)
63ae99
 A = a
63ae99
 
63ae99
 ## An import library is needed for z/OS and MSVC
63ae99
@@ -74,20 +74,13 @@
63ae99
 
63ae99
 LIBPREFIX=
63ae99
 
63ae99
-# Change the stubnames so that poorly working FAT disks and installation programs can work.
63ae99
-# This is also for backwards compatibility.
63ae99
-DATA_STUBNAME = dt
63ae99
-I18N_STUBNAME = in
63ae99
-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
63ae99
+LIBICU = $(ICUPREFIX)
63ae99
 
63ae99
 #SH### copied from Makefile.inc
63ae99
 #SH## for icu-config to test with
63ae99
 #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
63ae99
 #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
63ae99
 
63ae99
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
63ae99
-#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
63ae99
-#SH#
63ae99
 #SH## ICULIBS is the set of libraries your application should link
63ae99
 #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 
63ae99
 #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
63ae99
@@ -139,6 +132,9 @@
63ae99
 #ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
63ae99
 #ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M#
63ae99
 
63ae99
+# The following is for Makefile.inc's use.
63ae99
+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
63ae99
+
63ae99
 ## Versioned libraries rules
63ae99
 #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
63ae99
 #	$(RM) $@ && cp ${
63ae99
@@ -154,5 +150,17 @@
63ae99
 # These are needed to allow the pkgdata GNU make files to work
63ae99
 PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"
63ae99
 
63ae99
+# Just the libs.
63ae99
+ICULIBS_DT	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_UC	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_I18N	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_LE	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_LX	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_IO	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_CTESTFW	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_TOOLUTIL = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX)
63ae99
+# Link commands to link to ICU libs
63ae99
+LLIBDIR		= -L$(LIBDIR)
63ae99
+
63ae99
 ## End Cygwin/MinGW specific setup
63ae99
 
63ae99
--- icu/source/config/mh-mingw64	2015-10-08 05:54:30.000000000 +0200
63ae99
+++ icu/source/config/mh-mingw64	2016-06-07 16:30:15.051165239 +0200
63ae99
@@ -66,7 +66,7 @@
63ae99
 endif
63ae99
 
63ae99
 # Static library prefix and file extension
63ae99
-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
63ae99
+LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX)
63ae99
 A = a
63ae99
 
63ae99
 ## An import library is needed for z/OS and MSVC
63ae99
@@ -74,20 +74,13 @@
63ae99
 
63ae99
 LIBPREFIX=
63ae99
 
63ae99
-# Change the stubnames so that poorly working FAT disks and installation programs can work.
63ae99
-# This is also for backwards compatibility.
63ae99
-DATA_STUBNAME = dt
63ae99
-I18N_STUBNAME = in
63ae99
-LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
63ae99
+LIBICU = $(ICUPREFIX)
63ae99
 
63ae99
 #SH### copied from Makefile.inc
63ae99
 #SH## for icu-config to test with
63ae99
 #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
63ae99
 #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
63ae99
 
63ae99
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
63ae99
-#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
63ae99
-#SH#
63ae99
 #SH## ICULIBS is the set of libraries your application should link
63ae99
 #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. 
63ae99
 #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
63ae99
@@ -139,6 +132,9 @@
63ae99
 #ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
63ae99
 #ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M#
63ae99
 
63ae99
+# The following is for Makefile.inc's use.
63ae99
+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
63ae99
+
63ae99
 ## Versioned libraries rules
63ae99
 #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
63ae99
 #	$(RM) $@ && cp ${
63ae99
@@ -154,5 +150,17 @@
63ae99
 # These are needed to allow the pkgdata GNU make files to work
63ae99
 PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"
63ae99
 
63ae99
+# Just the libs.
63ae99
+ICULIBS_DT	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_UC	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_I18N	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_LE	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_LX	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_IO	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_CTESTFW	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)
63ae99
+ICULIBS_TOOLUTIL = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX)
63ae99
+# Link commands to link to ICU libs
63ae99
+LLIBDIR		= -L$(LIBDIR)
63ae99
+
63ae99
 ## End Cygwin64/MinGW64 specific setup
63ae99