diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-11-30 22:50:29 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2013-11-30 22:50:29 +0000 |
commit | fc20c2299289745cf31cd3ae28c90570d9ae4c2f (patch) | |
tree | 1195158660a62471b9dd5f6c95803ed60c9755f6 /dev-libs/protobuf | |
parent | Depend on alsa-plugins with multilib fix. (diff) | |
download | historical-fc20c2299289745cf31cd3ae28c90570d9ae4c2f.tar.gz historical-fc20c2299289745cf31cd3ae28c90570d9ae4c2f.tar.bz2 historical-fc20c2299289745cf31cd3ae28c90570d9ae4c2f.zip |
Fix builds on x32.
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'dev-libs/protobuf')
-rw-r--r-- | dev-libs/protobuf/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/protobuf/Manifest | 27 | ||||
-rw-r--r-- | dev-libs/protobuf/files/protobuf-2.5.0-x32.patch | 15 | ||||
-rw-r--r-- | dev-libs/protobuf/protobuf-2.5.0.ebuild | 3 |
4 files changed, 39 insertions, 12 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index 2fed77e926ce..e16fa0fc7a33 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.53 2013/09/06 18:03:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.54 2013/11/30 22:50:23 vapier Exp $ + + 30 Nov 2013; Mike Frysinger <vapier@gentoo.org> + +files/protobuf-2.5.0-x32.patch, protobuf-2.5.0.ebuild: + Fix builds on x32. 06 Sep 2013; Tim Harder <radhermit@gentoo.org> protobuf-2.5.0.ebuild: Add missing setuptools dep for python support (bug #479678 by hasufell). diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index 0f79653ab162..904a7498fca4 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -4,22 +4,29 @@ Hash: SHA256 AUX 70protobuf-gentoo.el 170 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c WHIRLPOOL aeffdec54d947cc219058a1efbe54898b2917947f07cd2249064593542b51e3c772a584106365d57dd9ea7fdf078bea388f6ff73ff857cabefa04aabda07495d AUX proto.vim 49 SHA256 17e7773363e3f5469c717e4173a6f6fa959a6bb30c6ee71f3bdeee159ee5b784 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e WHIRLPOOL 79c1fb6392c0a04fc6a4aec40c983b43f2eb2a3bd5cf807d37fa65b15191b6839a2c9cc182f9f05b7f2873e6689559f634d51c7db5f837d683d5411ecd50a43a AUX protobuf-2.3.0-asneeded-2.patch 705 SHA256 558ea98a54e544919837f88d133b8887ad5101b4493a62737d3cea94ae58464c SHA512 2f9d047ac64ac19bab2a793990de5070ac24604bf81622520a1f9b2e86aecbd125c9cba5b62bc7e296ecc3724069dbd9b07f7d7292be280403fc37af5c52cccf WHIRLPOOL 0b943cdda7feac71d394a9e72bdcbe1dfc3d7efb390496244cf511cbd1468b4b11d9f42501a62fe02b2fab7b4bf0867eb5739cb02af8d4777d22fe781ccd841e +AUX protobuf-2.5.0-x32.patch 677 SHA256 8a4378b5b84cf1b91e88344eead7c3e8f3ae848540e7a850bff48994704e8752 SHA512 fa28941ff21785505f616e4da4be964e18de5d52a25224059431054ad7853693ca4281819d690e76eb4064d9d7b729eb1ad10388d43d437b975e62b66f5de1bc WHIRLPOOL 2ae6b2dd9c6d9f63ae2d8caa630e4720d66a30ac3e21bf135f10d4b567a08fecd8757b575a749a95050c6b673b787c09b18f48452cc7d0eaa019b8aa5903d3d4 DIST protobuf-2.4.0a.tar.bz2 1508837 SHA256 cef863023fb051b0f7e8f47b53fe57f7277a7743d644eae9563fb14db5bd7e4e SHA512 c099f75983a79a4fdc2c3bf44e748074000903fe89e65a74caebe191dbb46da01b3b023b5f4f1fec86f35f15c16d5863cad102ebc0c975f4c4662ab64694d9db WHIRLPOOL 5fe8b4aadefceadfcf42aee54d4133ada2c52a9f4e90e0cbe8ba1a92c887bc12c4e9eec6b2df68ab252dbe9358a85a789804c0d1f5612d62e6c03ebf380c5100 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d EBUILD protobuf-2.4.0a.ebuild 2984 SHA256 8a5363f9fbdcb92e3b6574182a80c985f33c5d70a06a02c20187eaf40bff2ba1 SHA512 774efb0342230eec232c7d33cafd558ba57601e3ef7e2fb9d9b854fa996b3c81a7db9349ef6be126d9d2f3a313b9c6562f1ed6053c837c52c38409f0936ed68c WHIRLPOOL 0be09e6364881c0b2d15e2e087bbe1f82e83e4d8b73502af764c2ee8474939d1d0e9416d5343d665180fe76a02a07111bed85eac7e9aa579f01eb04cafbdb93c EBUILD protobuf-2.4.1.ebuild 3029 SHA256 a490f5298acd6361fa8f83faf665fb125b78c481afc50268650d156f6df90a54 SHA512 2ab2853d0376e8540590a00bd39e2f22e77bacaea94c6b460f088d109127580124561b7bfbc1eea41712cafa893cfa8eedea5eb57b6f8bcfb4ca3225684154e2 WHIRLPOOL 15aadc43d108057fef107494db0f13c8b66ed857dac442aed867699de2d62fb475bce6cb07d49ef1a09ebb6b1df3ab30635a46d450684d09abfe5284d809f39d -EBUILD protobuf-2.5.0.ebuild 2860 SHA256 d45378d1ad757f9cd8921749f9f79b26dd3ab267c7306fe3c565f8c0b11c1ebc SHA512 41fc47de953ec3d09fd84ae8dc4d5f202675f9b5b077d3172040909ffdcbe06fb29534bf688438600c48fdaba33752aef08d171524187814a111b9ba3d9980fb WHIRLPOOL b8e03fbd3e54ae5907b17715774a0830f6fe31d018ba0edb0996986c1de5b653e286f635d9b8085b0be94c61ee407c68e80c9746b2c5826e8b18e5eb004ddce9 -MISC ChangeLog 7713 SHA256 a713212c23427531890b68ff55dfee53226cb0e7f79cdf594736a85649ae6183 SHA512 1d69facef5216f896aca2a999ae6d09b7416036d838ae5efcb83a02b71d319780f864662cf6669905af5370e1c22e29a1a9f17fe9c4fc3c9baf67d5c37990d17 WHIRLPOOL 749c9d42f6e051424081f4fde96657f196f8caa32f77f275400b266e955cb36d329cd02dce740bf909ed1b3e63942227c8e63eb54c993565967907e35a145588 +EBUILD protobuf-2.5.0.ebuild 2894 SHA256 b5f483c5de91e97aa8251d1ea7e55f857145e6281ba14b97718370b9c4ca4cf4 SHA512 cbea2306dd81706d45e90a896103955824fb63b36c023b23529220e74d3bc407b2698397ade21dcede42e3af2b47ad429bd9a4c2349edde77dbde662f805e2dd WHIRLPOOL 0ae4338ac17b51cd92f8f36694bd68a6eb235cd15ff8b58edb7f5012b18a2ef43ee8d2c34f57535431574c150e5b5ea5e5912675e604f5fe28ecc599ed704968 +MISC ChangeLog 7840 SHA256 00a45990c97d5e0c2bbce6c21873001387a68543b8198cdbe2767b6b959037b2 SHA512 df62a7f95247efab176f3bb9c6c2905dc34d059c66f2c5e395dd570e7fc3f518404a9947f1ab77de583ee6f29e42db4e2a7fe83bd9e889f38ac40c69e96e6886 WHIRLPOOL 659aa31d1802d847a4a78099d534a8eb003720f2d5631bb9da330cc6c260a8ecf472c796714d8c8589ad68e077e929ae032aac5366ad47b457aa8a5f96f06444 MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSKhjpAAoJEEqz6FtPBkyjHKoH/jxt/k/lFbRZoSvxDyHdQZY5 -PtgbipGgZDhIRVzqvx92UeQPz31FvzNcobNh+iX0n6PRq5UzoP8tT8eIFaryfaD+ -vz46JIyI4QkCgmsEE5Bi50xZQXAEDyhFGxq0Xct9TETukixmvIN7JPpjnRxL4+B+ -trN1wdlbmIObTm8IxEp5RvjFCIbFc62elCa8vEcYMHzKo/IUM5QhNNvFtwpLxuHL -gud96/Q3xXkg065X8wPUUVPtM/6CLilRUY7/O5klE+iZBUvYUK4WKia/Nfy1BVAy -E0DjOSO9T6sD4kM5G2gEAG1lFtYWA/GXmBvD5YinkjN18aX2ccgHnmWowGmsTVE= -=uJaV +iQIcBAEBCAAGBQJSmmu2AAoJELEHsLL7fEFWzIYP/3QfqPJSgcx+XJMxGznpiwhr +vUYEIl+KKsVERWDouO3XKq0oFUYV6OwE3ztQZerRX6MkyE+X5QezqEIq4hOd+eSB +ckXXXQs1jSyn4Yw+ca8//GZEdgf0itMWWzbqLQHu5jq4ajhrPQ7yiLTUNsMoUY4m +ZIhHf1D0oy8wJx+zVSgfvjbOOKfonmMsKpVOiiXUg5EtxyydCgbTuhx+Np0NRlTS +iT2uW1/mPEUUFgsoETDaH8uQAYPtlwDd3RFamvDQqL1GRbU30xv5VEwCmw4s8JC7 +d/f5hJb3ThEGA0+fT+cCRXpaABTMOD1ZIMbBqwPUUBcl3rW+d/kJlMmz5FCwXy6S +/NTDhyUgK4YAr4SBIkdj9z9h849BB5Bb9EtR8YR+vrbPQUjb1yHJ3z4i6d9s5ETp +8vAZgke+UxxatiBoF6Qc0z1L1GIxHRuXqqcV5o5ht4VucseDhfDI5BVHbsO+IN4m +S/QHE9wQhSkGzcTR/q4s6HXSjKgPF+AkxPwjGjR7M1AtjuILMuPUa8lvitRct4ZA +NAACfkQinRjeOCEOzug2PdNXhaPPPiorwk1gZFPWvENEDVUQ9yFJeQO6HcDGCN42 +ywlzERDv+sdH2uAtL37HedXSX+qxzGPy0NooqJi16RzdwFC8IspI01koc7pQXH5b +I0+rwthqHC3A3Uoj/qBo +=FHsL -----END PGP SIGNATURE----- diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch b/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch new file mode 100644 index 000000000000..5c8d47831807 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch @@ -0,0 +1,15 @@ +fix from upstream for building w/x32 + +https://code.google.com/p/protobuf/issues/detail?id=474 + +--- src/google/protobuf/stubs/atomicops.h (revision 491) ++++ src/google/protobuf/stubs/atomicops.h (revision 492) +@@ -66,7 +66,7 @@ typedef int32 Atomic32; + #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT + // We need to be able to go between Atomic64 and AtomicWord implicitly. This + // means Atomic64 and AtomicWord should be the same type on 64-bit. +-#if defined(GOOGLE_PROTOBUF_OS_NACL) ++#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL) + // NaCl's intptr_t is not actually 64-bits on 64-bit! + // http://code.google.com/p/nativeclient/issues/detail?id=1162 + typedef int64 Atomic64; diff --git a/dev-libs/protobuf/protobuf-2.5.0.ebuild b/dev-libs/protobuf/protobuf-2.5.0.ebuild index 77d3f05c8428..7416b1de0bac 100644 --- a/dev-libs/protobuf/protobuf-2.5.0.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.5 2013/09/06 18:03:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.6 2013/11/30 22:50:23 vapier Exp $ EAPI=5 JAVA_PKG_IUSE="source" @@ -27,6 +27,7 @@ RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.5 )" src_prepare() { + epatch "${FILESDIR}"/${P}-x32.patch if [[ ${CHOST} != *-darwin* ]] ; then # breaks Darwin, bug #472514 epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch |