Fixing CFLAGS for #361129

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

diff --git a/dev-db/tokyocabinet/ChangeLog b/dev-db/tokyocabinet/ChangeLog
index 9b3f85337fc84396ed3eb745e5901e2d8bb784ab..b39680ff0130ca40c1feff6ab8c9806c9ad97cb0 100644 (file)
--- a/dev-db/tokyocabinet/ChangeLog
+++ b/dev-db/tokyocabinet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/tokyocabinet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/ChangeLog,v 1.38 2011/04/25 14:33:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/ChangeLog,v 1.39 2011/08/13 08:10:42 patrick Exp $
+
+  13 Aug 2011; Patrick Lauer <patrick@gentoo.org> tokyocabinet-1.4.47.ebuild:
+  Fixing CFLAGS for #361129
 
   25 Apr 2011; Thomas Kahle <tomka@gentoo.org> tokyocabinet-1.4.47.ebuild:
   x86 stable per bug 361129

diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 6ddcb647802e0c91be1ef9e706f50f7a1969ff87..fe7d839f502460a3d638218eef1ea6fff2ab16b2 100644 (file)
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,9 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.4.45.patch 437 RMD160 9c33d524bcd66ab62e7027a19d9af3209237d9d3 SHA1 ab6aec95fa41ee3ebbcf0ac27390e62b4c1bde9b SHA256 29f411600670c8c243ff39bdc94b894a4279c88142ec9f885b3b72332ddf8643
 AUX 1.4.46.patch 480 RMD160 c265a43e9641af15cf4c2f1a4389278b4db51a46 SHA1 c7b9dcb5db8ab8083e3fb901d1d6414a3e78e469 SHA256 bd9d9f29ab05a056817c8dfae4be2c4728fd1ccbcf682f35e50dc15acd3f1d88
 AUX fix_rpath.patch 2111 RMD160 ef1878e4519d3e056847b6bb98069d343987d737 SHA1 4bc2679a8fd544ae2275f1113f5096d540987ae9 SHA256 cba364650da90d9fcae3424a1e6ce400769db193c863e5cdbf29a4ced0292ce6
@@ -11,20 +5,6 @@ AUX remove_docinst.patch 456 RMD160 08df40c4b6c75de71d724151eb04b68d9cace9d0 SHA
 DIST tokyocabinet-1.4.46.tar.gz 1002423 RMD160 8e7451bcec30e1a432f6d9fea70c2e39027781f8 SHA1 031569d1eb181584ce4a96c4951341e6b29be8c8 SHA256 0eaaa3305cb67bd0555d228b28d842db6c6dc928dced9ad852980d82a7d933a3
 DIST tokyocabinet-1.4.47.tar.gz 1002443 RMD160 50c6ca7d1c24ebe5b59c84a5ae46f8949258d3d7 SHA1 18608ac2e6e469e20d1c36ae1117661bb47901c4 SHA256 a456193bac4843c0f0caa877b828c8d99dc44495511df10e1b00acf81c538594
 EBUILD tokyocabinet-1.4.46.ebuild 1158 RMD160 64e04d343b4f4fee8159f41c0081fa0b3b1a0626 SHA1 967185430f8e905e6dfdbb1eb004af9a0daf2b37 SHA256 6374ea22b863587642f790ed2458db3b1367475c7db6d3e058bb931d9f3d8a77
-EBUILD tokyocabinet-1.4.47.ebuild 1410 RMD160 5932375c48b94c46bf017a937b7df4208472caf3 SHA1 acc4accfd91c3e4d6e574af4a6b471debff71f1f SHA256 298b9c2920c8daa704029058b0e38d38895833f8b2211c09dff5da2bfa2bd0f3
-MISC ChangeLog 5783 RMD160 c8d5f1bf4d5563e96149227bf42f18aaf0648ec6 SHA1 0e588b8180f3f525549a4e9270e140a27edbe686 SHA256 46cb11f769eb2b7ea0ec8fa6570df6580bd1f6e3d425c9805ebcb0c93c5c2d50
+EBUILD tokyocabinet-1.4.47.ebuild 1566 RMD160 a3c8c5b3bbfce39566e8bd8d0c366dc8a14c3f2c SHA1 94d6efbdc8307cd163b21ed1bb412992cd148797 SHA256 a18eb8ca9708e893715c078f064e29ba65fd2da28fd5140596eb18950156abc4
+MISC ChangeLog 5892 RMD160 7df26e70c6e1130c87a2bdf4dd02f8f91222ecf6 SHA1 b4a5b480c8f395a5bc6324c622e77233cce0560c SHA256 900e37fa5bc07c61a85f2b1c6fc8a7a2dcdd384ff84f2aaf18791b0b60d8c06b
 MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk21hxkACgkQodBTJSDyo661zwD/aQ9KOiG8rpnTZW3wq1Vi2IPi
-tjRV69w/PzrXvvrzzKsA/1+l2kICtSkvF3ucQ/qXLwXSVq7iLW4PgYuSEXoQ3y3n
-=gNZ8
-- -----END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk21h58ACgkQodBTJSDyo65ZOwD+OKzwZ7hP+PQx4tzoVeaKyCq4
-fbaA4BWZ/Wi8udROCYMA/22a31u70RBlmRo1IO+YDl9jg9oYXh3zcX4AS7EgFDky
-=PxUR
------END PGP SIGNATURE-----

diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild
index aef3553f74820d75ecdd7bc90e49c2a499e090fb..67888b2f34ab2f2fa36e105e17f3b30e05641d11 100644 (file)
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild,v 1.6 2011/04/25 14:33:05 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild,v 1.7 2011/08/13 08:10:42 patrick Exp $
 
 EAPI="2"
 
@@ -27,6 +27,8 @@ src_prepare() {
        # cflags fix - remove -O2 at end of line and -fomit-frame-pointer
        sed -i -e 's/-O3"$/"/' configure.in || die
        sed -i -e 's/-fomit-frame-pointer//' configure.in || die
+       # flag only works on x86 derivatives, remove everywhere else
+       if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi
        eautoreconf || die
 }