Add arm64/sh love. Add cross-compile support #432106 by Dennis Schridde.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 38 insertions, 19 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index a09118a9a3c1..2ef68893495b 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/protobuf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.79 2015/03/10 17:24:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.80 2015/03/10 17:58:44 vapier Exp $
+
+  10 Mar 2015; Mike Frysinger <vapier@gentoo.org> protobuf-2.6.1-r2.ebuild:
+  Add arm64/sh love. Add cross-compile support #432106 by Dennis Schridde.
 
   10 Mar 2015; Mike Frysinger <vapier@gentoo.org> protobuf-2.6.1-r2.ebuild:
   Add ~ia64 #524084 by Paweł Hajdan, Jr..
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index e0ab846b67ed..146b03b55883 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -19,24 +19,24 @@ EBUILD protobuf-2.5.0-r3.ebuild 3429 SHA256 4c4a22dec5d74250a474f17bae9d643de9e5
 EBUILD protobuf-2.5.0.ebuild 2895 SHA256 7b68cf03751b6e799fc721746133e7fa4327834ccebde5356b238824caca5198 SHA512 452a3c2dde8463891b831c2b1edb776272795705131c803557d825363107e62f91874c688ebc080aab99452ba81ad7a4df5bb11a00677a7fbe7c258bc5908c05 WHIRLPOOL c15f67f8e3cfca30cc0f99aa9712deb5821ee71914051bdd84c4cd1c09fa31e587b9039256403534907599994e3f590f580ea0aabcba08f04336a72dadd66e28
 EBUILD protobuf-2.6.0.ebuild 2997 SHA256 8e7a679c4b2f353305c79cbe42eb59bb39138b2e6fdee6e03c8861cacbd9ea42 SHA512 00eaa39d421ce1c1a0f785d152f176714b585d24a7eea8f0248d37a58828b78927f3d6d34b6d15614b654afa8f74a30a07fb53bbdfdaaa4c3e9e8b4defadac1e WHIRLPOOL ef38db8a47623bf58cd353566307dcc602562caedb69f5c41680ba0070dc2b87d1534ae3ff6138d9206bd3f46f0e9f7e8d06f09e079d21953393eb16e420fde9
 EBUILD protobuf-2.6.1-r1.ebuild 3337 SHA256 cc3e48567a7e953bfd2cc825e7542e1c39581ed967a5c1831e4969fa57d527c8 SHA512 de3a31a1172280fa5a3fbb9b2ae930498549be290b004b17b5df736a5aaea9ca0c8dfb9d164980c6e8766179dba697c2969e2ddcc6281dcc4de9049a0544fcea WHIRLPOOL c09728fa06d082cae72dc8b349141a31c4e270e5cfc6c77252fd42a028d08a259794c0535f2fa22e51cf2ef5a15f7e0862d35e3e8a89a60bf127fa8a2dddc540
-EBUILD protobuf-2.6.1-r2.ebuild 3499 SHA256 c8cc903eb7f41b02e06c2b38848f37fa98a0b9d98178828fd8da92f35fdadbdc SHA512 8dc5af21443fe869afe4c130c6a2d27738695f923cb859002292c10e195370bb419009cc84650f9ae2a33cf7758cb8015b59264864a20fbf1ebb064125aa4fcb WHIRLPOOL 86cb31d15a271570c3604c6b9bb3eddbed08100d469a920ed9b15618b0c9d564619c201e4bdd33ac623a5687dbc21e0752f6a07c99c4983fb95a55392f8c8957
+EBUILD protobuf-2.6.1-r2.ebuild 4041 SHA256 d211e5077378c3021b69e61296e65fbbd527d3a0f377e55ef787b8a0905b91b2 SHA512 6f491877cd41ddcf5ea872f35243157ee7a73a370af14e55a5d9671ea058fdcae909ccecd5408a79811270a615bdbb3fdcdec98fbb1f10537c527c82892e75d6 WHIRLPOOL 1142de82a9e332cba3305d146f7faa3255affa0650eeecf9f600dafaae73dab91ec47cad22debd01f47b8136eb94d33d520fd24c27482cec838bdcd33c4713d4
 EBUILD protobuf-2.6.1.ebuild 3016 SHA256 4eeb189f80d262542237155d9bd6f82954159a4bb115e4afed0c7e580ccb80e8 SHA512 b98cf5ebd67b82e565cd81f41fbfbf2bce05375e00999f494b7d8f518001476ee42c7eccf21ce2d0bd5f01cb7db611779eb77207cee2e921c03250561a3ef3eb WHIRLPOOL 45a1a31272750d1071030d240a37150c3bad9a9c4bee0fca7719bd9e583b7a9df98356e53f0034232e454161fb925d8f7d119380fde133588a1016f43be0d8b5
-MISC ChangeLog 11200 SHA256 95377d0a6ebd7d7b3f08d5874f83c8820ae46f1b587bc284e3f2c20688137553 SHA512 33e37bf7e0fb902d73cc5bf7ef178e44f862cdb07578bf5da21fa52a22df0e56d1b320a18bc14bb5de4816675237c69fab352b6c421fc7f6707e29fda6af6be6 WHIRLPOOL faf3faa46261697f454a5a786d57060c3404cbcde44ef0cdb7f64f09f36467046af34cd960e077ba110771b1254930f2353aeb560cd3073044d84dc58ba83fe6
+MISC ChangeLog 11352 SHA256 1e15142dbb11bf9a42381aaf6013f1330c1d3ce642a789fd71fc7a943fecf975 SHA512 8c01a26ca049245aaee07f66d53c6b4d3eb7408d86efb6f8f352059a3bfead88dcd280c1882f81c55c52776b83132bb60853a4cdf532600c0218b1da5e430679 WHIRLPOOL e9fe5ae4a5bd7105d8084f2fb98a20ebb242742c6177e6225494211818ec6e42fc170f402026d2b48564823ec369725e410b05576c0b657cab3020a7a3e5d5ad
 MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/yjpAAoJEPGu1DbS6WIABZ4P+QEK9RSSk0gJS/sa3bmmm+Vz
-BUPdv2e0x7R2qR2UApmtSlAA8pxIvcJDFVGFIoCpIthw9hPNlsvafe5RIDdOvGUt
-3IjP0OlmgJn60LXIGYZj9KnPFXlciRl9N+zS8zNyjd4C3YGaIWNrFPY48oganmiG
-CrdJDvwuETo3M7A2s14eufkapyOhFsLttuSIsXj3Vj527O7b231/d9LhWesJ783D
-nOGb0ttoFJLnBxdkTi6YcI1XU0QUW3MIKwYmzZiTRbwPnkY8o7UZ0DGNVwlZHxTB
-SlqPcT4iQOwMD1gzKLPBvUrOimWx26L9e6dVq7JqNmPRN4iVZZJ8J/VdgUCiUHrB
-a45O94h0eDgMcJHtIviCD7UIYB8COdpdt9YtiCZu5ortTk5CDRuNTgecMnwNMer2
-CfXc5ibXdRNRltqcPfD3CIarb9BBFySp178VeKB+8KYZrH25QNvD+XeezWjoYaRj
-Hg2P3DRthFi3mEZIZkq/8wfm+jW/B4BbHOxiPlaj4PRLP+jTYs3PLwSgEmb8AFWH
-4fx6SPP8iDQdu1wpX/YwkIYvfqQ3QJSZlxeb3ZxRddBuQrgXoJ5eMwkv58KDPQPS
-5a3QCe5E70fHkKgyzRsb2bmmd2+NNWx7rxBXlCcs5Ajip55GAuz3E2NeuMp4HLgt
-X4kRuszlCoYNXxI26Jjd
-=Vc8L
+iQIcBAEBCAAGBQJU/zDWAAoJEPGu1DbS6WIAA/8QAIIoWMw2AZtG86sKg0nziZBH
+sloHo/cPqLYj/xR9vPW+cO1Q6uG3XlZlYrDTcBOS1MfW/fRMqKHLJn0zm6FaavEr
+dgq80bX+jzMGMmN1AGGAL8N83VqjPNwa3gHmEF6iZWOobMjv5S2eywIK/uGRcNht
+3mXAoKVMQF6GWZrHQi2w22lovfyxqnfsH0vqcEjNnEMue565zmNUdpSPVVUvwiPK
+o7rQAC+0gbTgBzR2WjzV7ByYDmcRSIi5N1sVWsuviWy9uC3EQxQK14KjkAx1Fc7g
+Kv1sr0xuK5QavxriUXvidRJaiHOp62UwP/vT2XJ9R7bPtqNHI1SWU/dqEsMjV3CK
+ebWpkCFujpiHotBWD261RrPzNybiHOYitbvc44KBKG5lhQkCMaUr7Efhn23ONybr
+BUyd70PukKJ77a7bQOk/y0jlE8uX5zj3Gvu+IqkOZjgoBNV+POkkATglZToPT6xp
+wGywbs7x9zSrGdq2EK+se4fvSGA/ABewGDzcKo5MN3j+b2sM1uazbVo4lHUs2ZPn
+Gm5bJeB7c3nSlrHn9O56d/jh9tPNNHftwhPaGzNQmA6duM4kTGYBxnyyz0Nd6r/o
+VnrSJkpl5V9Ivzq3/DWWmi9b6VCbo1XRkX4kHlc244gXVXUDMJ06vSvsw0kgTDL4
+BvFh9nabj+wyBs0bD1cy
+=9XFv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/protobuf-2.6.1-r2.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r2.ebuild
index 2e48245b2414..466373ed83f5 100644
--- a/dev-libs/protobuf/protobuf-2.6.1-r2.ebuild
+++ b/dev-libs/protobuf/protobuf-2.6.1-r2.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/protobuf-2.6.1-r2.ebuild,v 1.2 2015/03/10 17:24:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r2.ebuild,v 1.3 2015/03/10 17:58:44 vapier Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -9,7 +9,7 @@ JAVA_PKG_IUSE="source"
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
+inherit autotools-multilib eutils flag-o-matic toolchain-funcs distutils-r1 java-pkg-opt-2 elisp-common
 
 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
 HOMEPAGE="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/"
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0/9" # subslot = soname major version
-KEYWORDS="~amd64 ~arm -hppa ~ia64 ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~mips -ppc -ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples java python static-libs vim-syntax zlib"
 
 CDEPEND="emacs? ( virtual/emacs )
@@ -52,6 +52,18 @@ src_configure() {
 	local myeconfargs=(
 		$(use_with zlib)
 	)
+
+	if tc-is-cross-compiler; then
+		# The build system wants `protoc` when building, so we need a copy that
+		# runs on the host.  This is more hermetic than relying on the version
+		# installed in the host being the exact same version.
+		mkdir -p "${WORKDIR}"/build || die
+		pushd "${WORKDIR}"/build >/dev/null
+		ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
+		myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
+		popd >/dev/null
+	fi
+
 	autotools-multilib_src_configure
 }
 
@@ -81,6 +93,10 @@ multilib_src_compile() {
 }
 
 src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}"/build/src protoc
+	fi
+
 	autotools-multilib_src_compile
 
 	if use emacs; then