summaryrefslogtreecommitdiff
path: root/icu
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-04-06 20:59:50 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-04-06 21:04:34 +0100
commitbc6295e0b3cbb1544b31fd2e61d95e307c227f9d (patch)
treef73858614e6befa7bd1dd1daf0840457e9c22607 /icu
parent0c68a8e8fd4323d46d71ff852909389c37dda1e8 (diff)
make icudata lib target consistent with the others
Change-Id: Ide7c37c9738ca640e7d80ede904ad8d7702e5a34
Diffstat (limited to 'icu')
-rw-r--r--icu/icu4c-aix.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/icu/icu4c-aix.patch b/icu/icu4c-aix.patch
index 0cd19975fa1d..48659ca0406a 100644
--- a/icu/icu4c-aix.patch
+++ b/icu/icu4c-aix.patch
@@ -126,3 +126,30 @@
## BIR - bind with internal references [so app data and icu data doesn't collide]
+--- misc/icu/source/tools/pkgdata/pkgdata.cpp 2013-03-15 22:12:06.000000000 +0000
++++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp 2013-04-06 20:56:00.935656635 +0100
+@@ -888,7 +888,7 @@
+
+ uprv_strcat(pkgDataFlags[SO_EXT], ".");
+ uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]);
+-#elif U_PLATFORM == U_PF_OS400 || defined(_AIX)
++#elif U_PLATFORM == U_PF_OS400
+ sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s.%s",
+ libFileNames[LIB_FILE],
+ pkgDataFlags[SOBJ_EXT]);
+@@ -1302,15 +1298,6 @@
+ pkgDataFlags[LDICUDTFLAGS],
+ targetDir,
+ libFileNames[LIB_FILE_CYGWIN_VERSION],
+-#elif U_PLATFORM == U_PF_AIX
+- sprintf(cmd, "%s %s%s;%s %s -o %s%s %s %s%s %s %s",
+- RM_CMD,
+- targetDir,
+- libFileNames[LIB_FILE_VERSION_TMP],
+- pkgDataFlags[GENLIB],
+- pkgDataFlags[LDICUDTFLAGS],
+- targetDir,
+- libFileNames[LIB_FILE_VERSION_TMP],
+ #else
+ sprintf(cmd, "%s %s -o %s%s %s %s%s %s %s",
+ pkgDataFlags[GENLIB],