Fix building with large CFLAGS (bug #326021).

Package-Manager: portage-2.2.0_alpha19_p6/cvs/Linux x86_64

4 files changed, 110 insertions, 15 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index 3f115acc337e..df4abb276150 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.138 2011/01/15 14:41:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.139 2011/01/28 16:36:14 arfrever Exp $
+
+  28 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  icu-4.6.ebuild, +files/icu-4.6-pkgdata.patch:
+  Fix building with large CFLAGS (bug #326021).
 
   15 Jan 2011; Markus Meier <maekke@gentoo.org> icu-4.6.ebuild:
   x86 stable, bug #350861
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 751c632dd1ca..310a98be11b8 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icu-4.4.1-arm.patch 991 RMD160 b3c38623023414e47280c5418744f05a96cd049e SHA1 84e4a7702c90fb4d7ca04e9f59ec6a84cea2098b SHA256 06b829f497b1bedf96db76a34720a548b10ffafc2101b19a0f756b2048771b8e
 AUX icu-4.4.1-et_EE.patch 861 RMD160 bd2041795f3b1781fb5ddef85566487912c92c77 SHA1 730cae8657a162d6410be41580d86c9203183a4b SHA256 4719ac0e19e89b6bf48e17af9ccc7c7bb26e8e171576c348eb7b68664459b80c
 AUX icu-4.4.1-pkgdata.patch 2316 RMD160 4dda06ef2791a5f986c4f0baada2e13e979ddf2c SHA1 9d40795b94650c76f5c5eebb7ce57ed8634059e0 SHA256 6eef0649b635286ea94d84076ea76c26049b97bfa9f858b3e1479bb7de7229c4
 AUX icu-4.4.2-gcc-4.5.patch 1040 RMD160 2b59457c373693ccf07fa57af20d59347df19a52 SHA1 cc2b853a85e6f2b427f248bcd2cb9590bd0f8bb2 SHA256 2ce96779636acbf6eb189b2953368b397297f04160f0cc80b5faf52240935f10
+AUX icu-4.6-pkgdata.patch 4214 RMD160 0cdc3d409dcdedf7ac62cc0a29142d75dbb6aeee SHA1 c0bf9c4ca0767887ef4839e5f7ae31636d01d34a SHA256 643cfce19b2091fee859462a86dac7b6119063ee67abc1132d4700c44a79c271
 DIST icu4c-4_4-docs.zip 4743886 RMD160 6321fdc500d018358578249d32e84cfdc3f17db7 SHA1 fc76c72f8fa8954e6348fa2a34530cbc44e1491d SHA256 d7b21930173f9e4a9325bb7056081183c9fb395ca4eb259e9f5ea95239e53418
 DIST icu4c-4_4_1-src.tgz 15373744 RMD160 dae3634f7a1f9ce78e0b36c49503e5d3c43ebdc5 SHA1 0d011f7e1e042ec8e8833ac910056021d0924d91 SHA256 34994fc183da20a6572bbab56b0dc85d372ec3e574fffb5d571a0da95f723063
 DIST icu4c-4_4_2-src.tgz 16446776 RMD160 eb228e6fa9606855bbd881d98da738a61d72b74b SHA1 adc19231810eff2836a08b0e1f1a31a128d7a834 SHA256 2ecefdfb134b5b364ed01c2f613a9ccb11489dbae5857d63cd17ba5b6caca789
@@ -12,13 +10,6 @@ DIST icu4c-4_6-docs.zip 4884171 RMD160 ac5bc160bdb0f183ab0c5aa31324fa197b1a43f5
 DIST icu4c-4_6-src.tgz 15543712 RMD160 1cb84839384af5cba75bda6358c8bdaa82adaa9c SHA1 efc68a73a424d5822565feaf4468336f77294e8e SHA256 b5a1ada8127d8b79187f887903e34a87dbecea2659a139993bf81ad7309ddffc
 EBUILD icu-4.4.1.ebuild 2098 RMD160 eb5539b424ee0012bff9da2605e0629773b88b80 SHA1 4cfdfacb3271fe9b451ca8066e2a031348821564 SHA256 0f999788ade05fe2f83b9458c43ff75d5ff10e089e4a7fa7b785a5ec6d2b430f
 EBUILD icu-4.4.2.ebuild 2151 RMD160 e64d9e89ce611af8fae4ea10bb0ba25ccd26de0f SHA1 370418d0a058e41f6d8cac4f39c709110ed58645 SHA256 3424db1ed150e64dc9da89ddbffe1e0c379c69b88b475d22450bde7f9a212aa9
-EBUILD icu-4.6.ebuild 2252 RMD160 5d556a9b3c7de3fae3d9328e6ae3d148766ad14b SHA1 873cf4586274a6f4aef802735318d43fb6ce2a7c SHA256 d6023ceb6e853ccc7e349aacc414693f5aa5cf5428956f62c1d38c7dc6f47058
-MISC ChangeLog 17094 RMD160 a3d6f41c389a31b64146ff5ef26bfef1a053d3cd SHA1 f54a9f1d4c120988559a8bf1bc218f7ba26dda3d SHA256 1d1372f76346a7f94a846d90adadb7005350c22ca72c2f8f838df9b75d9922c0
+EBUILD icu-4.6.ebuild 2303 RMD160 6b59b4274b1e01420d1bb8ae7dd1525a30e4eb73 SHA1 839bd928ba5d810d705af97f4e770b8ea64d3eb6 SHA256 ab9771de586483c8cb30d10de7b10a6faf040209f5678e5a9cb36152b91c6d84
+MISC ChangeLog 17266 RMD160 3ecb8d5357a4846260d14d0b0d9e5a6177a2c31a SHA1 12c278dd334487e7143378a7066da390c3eac5bc SHA256 ce3a93cc1cd8d17f4bc0ce90f1d129f4abc1768bc77a32e9dae6e9607100cb9b
 MISC metadata.xml 274 RMD160 f6c9aaa14cf80600c44d1d0d12c730a12f5e49e4 SHA1 9706a00065836188ad7230fa495ae17bd17af0ad SHA256 864842139ba093b36d85ea2d306c53601c04fe89266a9136161dce58cdc229e9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0xshoACgkQkKaRLQcq0GLp9QCdEAMQxBfBevlIBYXzZr6TkD3x
-zO4AnR2bCvj226YhMPZIak9K3fMDW8Ao
-=Ob43
------END PGP SIGNATURE-----
diff --git a/dev-libs/icu/files/icu-4.6-pkgdata.patch b/dev-libs/icu/files/icu-4.6-pkgdata.patch
new file mode 100644
index 000000000000..df9b4045fa0c
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.6-pkgdata.patch
@@ -0,0 +1,98 @@
+https://bugs.gentoo.org/show_bug.cgi?id=326021
+https://ssl.icu-project.org/trac/ticket/8281
+https://ssl.icu-project.org/trac/changeset/29332
+https://ssl.icu-project.org/trac/changeset/29333
+
+--- tools/pkgdata/pkgdata.cpp
++++ tools/pkgdata/pkgdata.cpp
+@@ -1,5 +1,5 @@
+ /******************************************************************************
+- *   Copyright (C) 2000-2010, International Business Machines
++ *   Copyright (C) 2000-2011, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  *******************************************************************************
+  *   file name:  pkgdata.c
+@@ -99,6 +99,7 @@
+ 
+ #define LARGE_BUFFER_MAX_SIZE 2048
+ #define SMALL_BUFFER_MAX_SIZE 512
++#define BUFFER_PADDING_SIZE 20
+ 
+ static void loadLists(UPKGOptions *o, UErrorCode *status);
+ 
+@@ -484,9 +485,8 @@
+ 
+     if (!specialHandling) {
+ #if defined(USING_CYGWIN) || defined(OS400)
+-#define CMD_PADDING_SIZE 20
+-        if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
+-            cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE);
++        if ((len + BUFFER_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
++            cmd = (char *)uprv_malloc(len + BUFFER_PADDING_SIZE);
+         } else {
+             cmd = cmdBuffer;
+         }
+@@ -1133,6 +1133,7 @@
+     int32_t result = 0;
+     char *cmd = NULL;
+     UBool freeCmd = FALSE;
++    int32_t length = 0;
+ 
+     /* This is necessary because if packaging is done without assembly code, objectFile might be extremely large
+      * containing many object files and so the calling function should supply a command buffer that is large
+@@ -1140,15 +1141,18 @@
+      */
+     if (command != NULL) {
+         cmd = command;
+-    } else {
+-        if ((cmd = (char *)uprv_malloc(sizeof(char) * LARGE_BUFFER_MAX_SIZE)) == NULL) {
+-            fprintf(stderr, "Unable to allocate memory for command.\n");
+-            return -1;
+-        }
+-        freeCmd = TRUE;
+     }
+ 
+     if (mode == MODE_STATIC) {
++        if (cmd == NULL) {
++            length = uprv_strlen(pkgDataFlags[AR]) + uprv_strlen(pkgDataFlags[ARFLAGS]) + uprv_strlen(targetDir) +
++                     uprv_strlen(libFileNames[LIB_FILE_VERSION]) + uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[RANLIB]) + BUFFER_PADDING_SIZE;
++            if ((cmd = (char *)uprv_malloc(sizeof(char) * length)) == NULL) {
++                fprintf(stderr, "Unable to allocate memory for command.\n");
++                return -1;
++            }
++            freeCmd = TRUE;
++        }
+         sprintf(cmd, "%s %s %s%s %s",
+                 pkgDataFlags[AR],
+                 pkgDataFlags[ARFLAGS],
+@@ -1166,6 +1170,21 @@
+             result = runCommand(cmd);
+         }
+     } else /* if (mode == MODE_DLL) */ {
++        if (cmd == NULL) {
++            length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) +
++                     uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP]) +
++                     uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) +
++                     uprv_strlen(pkgDataFlags[LD_SONAME][0] == 0 ? "" : libFileNames[LIB_FILE_VERSION_MAJOR]) +
++                     uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE;
++#ifdef U_CYGWIN
++            length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]);
++#endif
++            if ((cmd = (char *)uprv_malloc(sizeof(char) * length)) == NULL) {
++                fprintf(stderr, "Unable to allocate memory for command.\n");
++                return -1;
++            }
++            freeCmd = TRUE;
++        }
+ #ifdef U_CYGWIN
+         sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s",
+                 pkgDataFlags[GENLIB],
+@@ -1209,7 +1228,7 @@
+     tempObjectFile[uprv_strlen(tempObjectFile)-1] = 'o';
+ 
+     length = uprv_strlen(pkgDataFlags[COMPILER]) + uprv_strlen(pkgDataFlags[LIBFLAGS])
+-                    + uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + 10;
++                    + uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + BUFFER_PADDING_SIZE;
+ 
+     cmd = (char *)uprv_malloc(sizeof(char) * length);
+     if (cmd == NULL) {
diff --git a/dev-libs/icu/icu-4.6.ebuild b/dev-libs/icu/icu-4.6.ebuild
index bf50c2aad1ef..22ab6f053668 100644
--- a/dev-libs/icu/icu-4.6.ebuild
+++ b/dev-libs/icu/icu-4.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.6.ebuild,v 1.7 2011/01/15 14:41:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.6.ebuild,v 1.8 2011/01/28 16:36:14 arfrever Exp $
 
 EAPI="3"
 
-inherit versionator
+inherit eutils versionator
 
 MAJOR_MINOR_VERSION="$(get_version_component_range 1-2)"
 MICRO_VERSION="$(get_version_component_range 3)"
@@ -49,6 +49,8 @@ src_prepare() {
 	for variable in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
 		sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
 	done
+
+	epatch "${FILESDIR}/${P}-pkgdata.patch"
 }
 
 src_configure() {