You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
96 lines
4.0 KiB
96 lines
4.0 KiB
Index: source/common/putilimp.h |
|
--- source/common/putilimp.h.orig 2014-10-03 18:11:20.000000000 +0200 |
|
+++ source/common/putilimp.h 2014-10-26 14:21:19.427014111 +0100 |
|
@@ -132,6 +132,8 @@ |
|
/* not defined */ |
|
#elif U_PLATFORM == U_PF_IPHONE |
|
/* not defined */ |
|
+#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) |
|
+ /* not defined */ |
|
#else |
|
# define U_TIMEZONE timezone |
|
#endif |
|
Index: source/config/Makefile.inc.in |
|
--- source/config/Makefile.inc.in.orig 2014-10-03 18:11:56.000000000 +0200 |
|
+++ source/config/Makefile.inc.in 2014-10-26 14:21:19.427014111 +0100 |
|
@@ -118,7 +118,7 @@ |
|
ICULIBS_BASE = -L$(libdir) |
|
|
|
# for icu-config to test with |
|
-ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO} |
|
+ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${A} |
|
ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A} |
|
|
|
# ICULIBS is the set of libraries your application should link |
|
Index: source/data/Makefile.in |
|
--- source/data/Makefile.in.orig 2014-10-26 14:21:19.427014000 +0100 |
|
+++ source/data/Makefile.in 2014-10-26 14:22:18.766998673 +0100 |
|
@@ -196,16 +196,16 @@ |
|
install-local: $(PKGDATA_LIST) ./icupkg.inc packagedata $(OS390INSTALL) |
|
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUPKGDATA_DIR) |
|
ifeq ($(PKGDATA_MODE),files) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(CURR_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE) |
|
- $(MKINSTALLDIRS) $(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(CURR_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(LANG_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(REGION_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(ZONE_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(UNIT_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(BREAK_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(COLLATION_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(RBNF_TREE) |
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(ICUPKGDATA_DIR)/$(ICUDATA_NAME)/$(TRANSLIT_TREE) |
|
endif |
|
ifneq ($(ENABLE_STATIC),) |
|
ifeq ($(PKGDATA_MODE),dll) |
|
Index: source/icudefs.mk.in |
|
--- source/icudefs.mk.in.orig 2014-10-03 18:18:36.000000000 +0200 |
|
+++ source/icudefs.mk.in 2014-10-26 14:21:19.427014111 +0100 |
|
@@ -149,7 +149,7 @@ |
|
ifeq ($(ENABLE_RPATH),YES) |
|
RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) |
|
endif |
|
-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) |
|
+LDFLAGS = -L$(LIBDIR) -L$(top_builddir)/stubdata @LDFLAGS@ $(RPATHLDFLAGS) |
|
|
|
# What kind of libraries are we building and linking against? |
|
ENABLE_STATIC = @ENABLE_STATIC@ |
|
Index: source/runConfigureICU |
|
--- source/runConfigureICU.orig 2014-10-26 14:21:19.427014000 +0100 |
|
+++ source/runConfigureICU 2014-10-26 14:22:59.927012355 +0100 |
|
@@ -376,26 +376,10 @@ |
|
|
|
if test $release -eq 1 |
|
then |
|
- if test "$RELEASE_CFLAGS" = "" |
|
- then |
|
- case $CC in |
|
- gcc|*/gcc|*-gcc-*|*/*-gcc-*) |
|
- RELEASE_CFLAGS=-O3 |
|
- ;; |
|
- esac |
|
- fi |
|
if test "$RELEASE_CFLAGS" != "" |
|
then |
|
CFLAGS="$RELEASE_CFLAGS $CFLAGS" |
|
fi |
|
- if test "$RELEASE_CXXFLAGS" = "" |
|
- then |
|
- case $CXX in |
|
- g++|*/g++|*-g++-*|*/*-g++-*) |
|
- RELEASE_CXXFLAGS=-O3 |
|
- ;; |
|
- esac |
|
- fi |
|
if test "$RELEASE_CXXFLAGS" != "" |
|
then |
|
CXXFLAGS="$RELEASE_CXXFLAGS $CXXFLAGS"
|
|
|