summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-10 18:16:20 +0000
committerMike Frysinger <vapier@gentoo.org>2015-03-10 18:16:20 +0000
commited15160eb9ce8dbd49301ec384b7f7a52bb155fa (patch)
treec66349b97b94759ef4d491056436e930ddf6c6e7 /dev-libs/protobuf-c
parentAdd arm64/sh love. Add cross-compile support #432106 by Dennis Schridde. (diff)
downloadhistorical-ed15160eb9ce8dbd49301ec384b7f7a52bb155fa.tar.gz
historical-ed15160eb9ce8dbd49301ec384b7f7a52bb155fa.tar.bz2
historical-ed15160eb9ce8dbd49301ec384b7f7a52bb155fa.zip
Add arm64/mips love. Fix cross-compiling #518440 by Luke-Jr.
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-libs/protobuf-c')
-rw-r--r--dev-libs/protobuf-c/ChangeLog6
-rw-r--r--dev-libs/protobuf-c/Manifest25
-rw-r--r--dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch29
-rw-r--r--dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild15
4 files changed, 62 insertions, 13 deletions
diff --git a/dev-libs/protobuf-c/ChangeLog b/dev-libs/protobuf-c/ChangeLog
index 1d8267cb67f9..523217fd518e 100644
--- a/dev-libs/protobuf-c/ChangeLog
+++ b/dev-libs/protobuf-c/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/protobuf-c
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/ChangeLog,v 1.13 2015/01/10 06:48:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/ChangeLog,v 1.14 2015/03/10 18:16:18 vapier Exp $
+
+ 10 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+ +files/protobuf-c-1.1.0-no-build-tests.patch, protobuf-c-1.1.0.ebuild:
+ Add arm64/mips love. Fix cross-compiling #518440 by Luke-Jr.
*protobuf-c-1.1.0 (10 Jan 2015)
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 8be6fb764f0b..07c4fe670e6a 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX protobuf-c-1.1.0-no-build-tests.patch 1108 SHA256 d53bbc9925c06b13c344574eb46f642a5c2231ae1df6cec3f53afd482d5ef0fb SHA512 631782453df70da302e614b62d14b67fe95dfd3b348c6c127ed197b8d1121f58e379b74f2a0886d4347017aad9097570682d9f5439bd4a246709f6a89044daa9 WHIRLPOOL 2ea4a97309bd46114e2dc3fa99e083e0511e6b0306c223c6d51a5018d3c3711597f54fe78180524ce3f5f84134013144e11945efb3bf0e1048c045a9a98ba91d
DIST protobuf-c-0.15.tar.gz 500911 SHA256 8fcb538e13a5431c46168fc8f2e6ad2574e2db9b684c0c72b066e24f010a0036 SHA512 a51b9977ca4a6a73dffe92c7f8f5526f5dd3561b5139df290bafe5093d0fd6ace701d9fa1ee92a9dc8394960efd48f739c44ac17a74a7acd8c365d63e6312e9e WHIRLPOOL 3fd2ab0e0008dfabb7d21e30601422fee5b069981d015eff5ada5857621904f339c63f09eedeb6271a8b35a4570e4dad614f58888bfb708e43c5991f6af8568a
DIST protobuf-c-1.0.1.tar.gz 448519 SHA256 e1b2989684ac51e62f8b7de8739c381717b27c7cf4410c7a7e39b958afd3cd74 SHA512 2974e098f8c2f49e6338fcb179cedefdb9651ef1ec53fbd1ce39d4a2778246a65f60fbfc30263d775cf830453e168ff0617a78f042a02660e21315cb57f2231c WHIRLPOOL 2df825bc6a7141bda78f24c9e2cee911cb09bd272b980a3e1299d4b322e02aa7e374e2917db8d07ce9009bbfc5dfd319c89f6067073e85646342336cb9da6087
DIST protobuf-c-1.0.2.tar.gz 449923 SHA256 db771f7b0e76d5bb14140a50df4a32553288fd3e701b60e90e034e22f411ef76 SHA512 d748712f4216015802ffeff1072266da98ba9d9a4dfdaecd1c1b9d76f15403112b5cc2563a54390653c5eb82d7b51caf4c1f595cf1287bcbb123efb646e12f33 WHIRLPOOL 7a18446fc7ea27c10cbc0393f96859f237fcf29c962e982270b8f4cd10e27366b42cc38d418e973d4295e41e7da522fc577df296063e8f723a51415a6783d48d
@@ -9,17 +10,23 @@ EBUILD protobuf-c-0.15.ebuild 618 SHA256 cd58469a230dee5b551ba43efd27706d30f1f0d
EBUILD protobuf-c-1.0.1.ebuild 697 SHA256 d71e59a8053b596bc21291efa450efb8e20096f3f7fa66e8ab5f6082f1fc8729 SHA512 fa744c291702436976c7d5381fcd1e7669d70f26a102a633d27c89555e12993f4225f17930f2196b09ab6fa5d7a28239f86f08ee1ccae1e253960344ce2244b3 WHIRLPOOL 10c5ded59f53ee64d0ccb4740065c295e181fc123f2a2383805c98f7e59134f261da9172cda03e1dc7fb44ee1a02960cb0376838ee17a61f15ad3fe2a994d9ad
EBUILD protobuf-c-1.0.2-r1.ebuild 754 SHA256 15ebea27cb7e52c25519bff1353f3afe74fefd3c00178b29f7fac2853bd9143d SHA512 4140304a2a592c79a2a10f0c3f09e74d425e4277180a6968314b05c54bcc4533e240ebfabb6c079f20496481d73355327a18d5bc99458bcc04311a57f537d5ef WHIRLPOOL 2f12b14730463aaa1a46264b08e86f3a1aa9103da35c769a79823d310b0ca61b32775813ef528550efccde6f31ab186a536b03f32fc4c3bd47eb9f162dfe5601
EBUILD protobuf-c-1.0.2.ebuild 705 SHA256 3eea13acea880e38c867ba5c5b628f5addfef37cde7640a0978c26c1e8c75d21 SHA512 8509c4fefbb17e405d8f316ecec32b19fca0c28e623022de107f08376ad811f908939271a61982216d15fec1484cc4c16fd59166730e5c53431bf585451ae1d1 WHIRLPOOL 4da8ed4c593fe67358912633a467816ab518e2d1cbb063a97383f7c4a89bedd7e73ffe0f8bf578502dc2691d070656d75bfd47bc0310aa018b8331ec8d1b8351
-EBUILD protobuf-c-1.1.0.ebuild 748 SHA256 ab815f06798f0b0883304b6d1c962d6c7d14d641dae1748f491f2a3234e385f3 SHA512 818de2d337e1ce240a4875696c211080f28e8c496925da8e90473f89f2a8f33c0166cbd0052fcf1014e07cfe9ea37039a3a7d30396b75598ca439c8bf76f8069 WHIRLPOOL 04722cfd4b6a0cd6ad1dbe1249180f917e314d79241c5d24d7ca900823d8ae55cb577647d9e28d6a3b2ca17dfc7e614b361ca70c9a602f4e7fd7191b613232fc
-MISC ChangeLog 1826 SHA256 45f0d940449b2857b4a04e4847349801a7c0d3db3abcf043593ffee67f43a32f SHA512 f991b4bb2ecea02575800e0587c1ece45be200d31fee0bcea8962085a8846027101aa554fcfcfc89bc8785dcdbd2615faaa1abfe68e3e11999ebacfa86af51ea WHIRLPOOL 9ad719a485f1dd9f37b13b5d845f4e5fae9018c93f208f9b7f58a7a381aa45b97b5296383b706a9a02c94df7d48860477bc0572a4dc13eaca44a5b5b71a18cbc
+EBUILD protobuf-c-1.1.0.ebuild 955 SHA256 6721934bf904d0a5e8fd10a7369497467a6e1e84059a97ff09101f7223cc64a5 SHA512 3e5663b499e6e6c3d23991d30fe1de4e69923fb697feeece9e52ec4fcc443d8a900050e8ecd2dcc69af054d4b69ece9fe6a9b14276fdf6898bb8df7ac658fbd9 WHIRLPOOL a4817195004c4e83f46eaf9bcd3f762246ce456bcd25891a490d4694614d494a79b6825898ba5bf897535ebe168725abaae6fe15b4291df73674bc1770acff9d
+MISC ChangeLog 2010 SHA256 b7fb20c88d55e1c167ad892e9ba041f5c5602cd9e827e274797c96177d698f1d SHA512 e96c340e91ac54fb47285fdd3e1f5997724e358c121511971ff5f16e3c4b71bfdf602d8de1354d91032b2d74a2999da3faad85d477df569c53a2ba8041460f27 WHIRLPOOL e3704906bf64f6515dba4b06054defdf1e34096790a2612f58f647964406ba5a04abed85825ba3d1d118987aced95cfbe06e0ecee11f6de7fbe8daf47dea4d15
MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJUsMs8AAoJEEqz6FtPBkyjRY4H/04bWw73ra2RppxXtAocT7eC
-pt3V5s1sqRsycFFUuBr7nsH7y5qkQsVvgoyC5nMpqH1tCuE8n2eWPScsZ930O1iV
-fJFFU7JM2+AHsgPdr1U3U72L6SRNHIq8fecMwnfy5dcoUQTRwCokjIs7r6lfXI2l
-swRd3/ElX/VG1HxNuqgskEZjTBNjKDFC5U3U1YuYI1W0oDLWsIuPaTlpFuWzuIo/
-BACd95ol4FI6O4FtSDvQdk3aJbVA9BhA9IRUv+cTs0h4MR8uddWBnpsMqPS2Wkpg
-H5jwWFomdLwQ08fZael0jgaKh0+c1JyAu6IGJXGy3YSRCDrJCrixXr0ga1+ezjM=
-=2R9u
+iQIcBAEBCAAGBQJU/zT0AAoJEPGu1DbS6WIAdS0P/3X9rqxTXZWoJ5XQI0j/xLbs
+sVxFZ59BZfDd0CZZ8lLMu74pqf6k0tmRgHBqA5kDKgkUwJj+M8gLiJ2UibtqCq4K
+5PjY4WtWxwX4wubq0iVeRPA+kTkAF2GNENazliTMVhCvp5D0p5taZ1e00e1USEhQ
+t1dHktAWUxFiuxE0BpBPhx4CiL/BMiyBolzquCWNcR4sZX2uhKneBGrhmCmBK3So
+Vw21Bxy8QpwjnPDpwDhBQj33MmicEcvRg/OedR/DdOG/0QPrarA+/cvwtvn7clap
+wlmVlBnYFY9b7ryyxWo1nqpF1KO79x/YB+/jTey+HzgqDNlTKshYGb5IsLwAwT+F
+3zzGc0EJ/dRcez4j7Q/aRZoFxBbcVVh+N3IIZEVST/+aVDjTsdbXVTJKFU5InM9s
++Fz+RmShGYXAmPWsm5ZAc3ddJ6DnVkOplGeHtyTMQUfxG2bwIHWRccrgcAQqYD/c
+NiIv+HvbxSZlvljvGIjQWTx6++cTEeUebGT18cgl3+jkOulesG+dBqRzG/3dBTLh
+aMMxOCw8TguoG0bnvq2d3uije6+x4fNlvQ4MoOhPYXDB2ZJ6Zs+oTOAMWrwf5gPK
+WGrpRaTrB5mAv8+lfl+ZORRPnZ/LjK/GU6KXpwbdzRF1/22MY15NPy+cKAQE0n2I
+kGeiVWCnBPPWcC5sJSlK
+=ss4y
-----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch b/dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch
new file mode 100644
index 000000000000..4e611d710705
--- /dev/null
+++ b/dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/518440
+
+avoid compiling tests when we aren't actually testing, especially since it
+requires a compiler to execute which fails when cross-compiling
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -135,7 +135,7 @@ t_generated_code2_test_generated_code2_SOURCES = \
+ t_generated_code2_test_generated_code2_LDADD = \
+ protobuf-c/libprotobuf-c.la
+
+-noinst_PROGRAMS += \
++check_PROGRAMS += \
+ t/generated-code2/cxx-generate-packed-data
+
+ t_generated_code2_cxx_generate_packed_data_SOURCES = \
+@@ -160,12 +160,6 @@ t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
+ t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
+ $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
+
+-BUILT_SOURCES += \
+- t/test.pb-c.c t/test.pb-c.h \
+- t/test-full.pb-c.c t/test-full.pb-c.h \
+- t/test-full.pb.cc t/test-full.pb.h \
+- t/generated-code2/test-full-cxx-output.inc
+-
+ t_version_version_SOURCES = \
+ t/version/version.c
+ t_version_version_LDADD = \
diff --git a/dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild b/dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild
index 4479ba20a3f9..72ea8aad8fe6 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild,v 1.1 2015/01/10 06:48:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/protobuf-c-1.1.0.ebuild,v 1.2 2015/03/10 18:16:18 vapier Exp $
EAPI=5
@@ -15,11 +15,20 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="static-libs test"
RDEPEND=">=dev-libs/protobuf-2.6.0[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
+ test? ( ${AUTOTOOLS_DEPEND} )
virtual/pkgconfig[${MULTILIB_USEDEP}]"
S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ if ! use test ; then
+ epatch "${FILESDIR}"/${PN}-1.1.0-no-build-tests.patch
+ AUTOTOOLS_AUTORECONF=true
+ fi
+ autotools-multilib_src_prepare
+}