Fix --enabled-shared for generic-gnu fallback targets (like ia64).

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

4 files changed, 72 insertions, 5 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 13bbc1a0a6b1..7d9362862eb5 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.62 2012/08/14 15:58:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.63 2012/08/15 15:35:23 vapier Exp $
+
+  15 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/libvpx-1.1.0-generic-gnu-shared.patch, libvpx-1.1.0.ebuild:
+  Fix --enabled-shared for generic-gnu fallback targets (like ia64).
 
   14 Aug 2012; Mike Frysinger <vapier@gentoo.org> libvpx-1.0.0.ebuild:
   Mark stable for arm.
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 3450973bb718..77bcea4d5117 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libvpx-0.9.5-enable-shared.patch 655 SHA256 44239d453714ca62523b299612d2ec279eceb2e74c296de1ef8eb5c8575ad86e SHA512 0162ef3138c03e649de27de1a4e0b3d9d7df074de279891a13e07b253fca46a6d4aa5f8f8b1fe6cb15f278e3b03a9a276da3c700024000bc245856274abc5690 WHIRLPOOL 5c96053e549d2c302e4955c928f105b6ab07c5c770969e2cdcea9cdd8d8c485c0e70edcdefc5401df48ae8c63f7ce56137313cc975fbb8372d7874d0496dbf86
 AUX libvpx-1.0.0-support-arm.patch 1086 SHA256 6b743cb44b3fe26a44f335e159411c37586677e72228e2e79ad60cbb72ba02d3 SHA512 12d5ffab6dfab1a3073a13aa7c76cb7aa2c96f26e280eecf598d5c9433535707fd29d025b312bcbb9b0e56d429b43aed8b87551d7def22549ba3ab95d2de5685 WHIRLPOOL 607a683d8f98ec45a9b5a13ba7dc280c880c0eb91a67e21656aa8220958ad3bf8349a88fc20ba372c2fb65215e39b9139b44baf7d6dada558e7f21654035ef40
 AUX libvpx-1.1.0-chost.patch 1441 SHA256 ad4f06433f403bffbe6e72809cae7d63545bb19a034bf87d8a6c0d09b183546e SHA512 3591bcbf4535c608eab2ff51befe60b492e0f1b738aaa864a02c463b89abebb38dde6e683fb92f47f6d5f6139cbc1feced6464c5f4501bdbeb91cc5b39ac9f3e WHIRLPOOL ecac0141e9688a12854813dbe7c57746e4ba096c91e38435fcb3e9d5a289b9c1b9cfb2498f42b4def899997e86fcd7441771a4c9d0514f9e49447711a423a8be
+AUX libvpx-1.1.0-generic-gnu-shared.patch 1466 SHA256 411335557d7b8f04f53c971dc7654fa04a5beaeab8114b6222cbf23c8f33958d SHA512 82d78a5c8acdd16bbecb250d049446d8a0804094311feec0ffb85865e1a90d5895833a410d88d036dc653971b43b69fbe947ceb21f8b82d3a79e0325e31daf68 WHIRLPOOL a500811c5560846930d3781558e0079b2fbbb7c98e646e930782f37ce67571e49c37fe549aee0aea72a36e522a9d8ecaf21c421c72ad9d020ff60b0b57f9eb34
 DIST libvpx-v0.9.6.tar.bz2 1230418 SHA256 28bd8a8ef216fb570912f0d378668051d99681bf13735b59e68a12ad79f2aa73 SHA512 5608a095c96c40bdf9538901c52dd68a1b33767cbc52d9f7c5f9e0b74147f85c31f9a940be827d01f28eaf6bb495f55e920b93edc61cacbaa067ab7aed918aa3 WHIRLPOOL 64e976c216b3528825059110ba84373387a4c4ce465ddc44db8ed01a2c8a64a8fc589730bb1dc99414ee97395950ad58b9ffa7c571c5ec2eca62176e86305aed
 DIST libvpx-v0.9.7.tar.bz2 1244448 SHA256 4436275b905d996f4f0e4a3f98f5d3ca4507a05b9b1e101adfd6f508fa6ae14b SHA512 1dd2d4e7cf1ee486c9e849fddd9d8b68c655d05455aaa4f64a77b801f326eeac93ff042a5463ab805f9956f0d8d81ef29b4eb6a29f75d68279f3a16d2fffe6cf WHIRLPOOL b355bb061ba072e2a7f8e8cdad9243fb6830091a3e398683ca71deb80b33d908ed1f17d7a8384941f1ed4f6dd1d0b507be2a1633d3d2f86de8701d3eb3f4cf71
 DIST libvpx-v1.0.0.tar.bz2 1641411 SHA256 07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21 SHA512 a54f594fd37f96a693b5377236cad0834581f189fbb8d55c7e3418cd72e217e0eda34b07c14744c7c0d34c0d5c8a19c7ca402146855d7163e3578b5fd2b075cc WHIRLPOOL 13f33478e03b655ce8c1d6248638f053d5a00dc35425de93834c34fc9f88836d1c3f113f5196ae311ab0b42c1f80f44784e4fcf206b6301b932b1d6d5a6635ef
@@ -10,7 +14,24 @@ EBUILD libvpx-0.9.7-r1.ebuild 2132 SHA256 e50a825cd4851d44192de4bc8cb516234555d9
 EBUILD libvpx-0.9.7.ebuild 2085 SHA256 7250b3f9fe2ef8d8d992b2e988e50abaedfdd98297f946a54180a3fe265b07f5 SHA512 46611bf63ae9d07df3d3bbc990f3d552329e37a63d8ca6378da824769f8835949ead4e9f1743c4b48319236d7a7985678e8d3716105fa68acae2e79dbf4ab5bf WHIRLPOOL 0fb3c64645a841ef80812ed26b827e1d92477c0a0e77d9a51a969adc2d8e30d1f02cfbbac359b16ce75035ce987a6c5b48364956b919b542e94cb3ece1bdeb61
 EBUILD libvpx-1.0.0-r1.ebuild 2414 SHA256 a3348796ef2f9e6ac03ddd5d28dbd410e7d03b3921b1e059739db46b89e78b6e SHA512 d9d62f1625a7c73f1bb20af64362636fc4f71bac089580e586f07dd967d568799bfee4ae04f227673e8c130214413f25c842d44ea76a2606f929627b0a8fb30e WHIRLPOOL 27944d057382b9d41c691b0f3e1144656d672ed61dd04de593c31ef87a85d4e9a79245d4c7edd7253bfe1a63ce61eab34c71a0ec82c77b14d3278683d6d22ccb
 EBUILD libvpx-1.0.0.ebuild 2092 SHA256 97bb9f0582b74a96ae347067355659b805ada412d8cd1af501fa78fffe358d5d SHA512 d0ee41839d72aed7f721a41f6f6fb502c6ec14dad48080959ddfaff7cf09267087f1a9b8965260335966c939cc0d05905db7f395fd579d50969858ab0b2b76df WHIRLPOOL bf471c2f83f2adc27271c4071ed2f93f92471b363e2fffc96d268d37084c1a7fba9d7852428af861d1f0b95d0844775dfe9017db1efe93c697b44bb864881abc
-EBUILD libvpx-1.1.0.ebuild 2240 SHA256 bc6cde565f0c9c2e3cdae99d434372fa652f9b00284e3d386241f6f30174d6ba SHA512 4ec76148a7da140366f5da5cbf1c3e243ac42fd261bcefe934acfba7b7821e148e1bfed8c3287d8792d4d5267c0f2a106501eca133b0d4d99c4b0008c2e2e28c WHIRLPOOL 8e2788547e1be95d197d62be53fd6797bd576e4af27dc1edd6c7e2d3f3adaa5a6355130c2eee38c38c0e2c68c781b2080f22ee80abbcda535b613b5039cdc6ed
+EBUILD libvpx-1.1.0.ebuild 2286 SHA256 fb707f87c4e5c6545befb9a6d0200dfe53e769f7e0cfc6961cc063537614113a SHA512 ac338fb62367cef27fdc372660a9111a4d7d35371c9f2d9bd7dc4677c890829433675cf8e4b8de9e145edc73b497dda838e50e662287c16edfe584ee3bb28795 WHIRLPOOL d26a9b9b9ab78d51113ddbb0e01730ef6f10740b533ec1b2e65c03c8001b525604e96ba6f1aecc4f8f87663ac605d9cdc4301bfa9f5b65c3f4ce0ca9462911d3
 EBUILD libvpx-9999.ebuild 2193 SHA256 56761edda37e74cc5baca0eed92bd4455b375b0717a1d04fe061a59e80874ec9 SHA512 6a998fa13f03155d3947f6f54f338099e1c85a12e4fe4f9d09bf02173a8df32fcaf129a57f45ce4c6b171f43e43a299daef5a687885f417433db0b2bf656cd95 WHIRLPOOL 7b5a9559255924b5309b4c4f3d16d9628699717bea335db839e6699a13ba659c891ac90d7171bfbee6335158678301472fe418906de61b18c8fb94e77b23bfe2
-MISC ChangeLog 9131 SHA256 8d903fcff49c71b70dcc710fd5db110b6cc5ea115e56dbee25e20c41a88e63c7 SHA512 595b45a52ca8b93fd8155f158dae744347bfcad1efef97ce558e694d274f9f99e1e7d1a952e5fa4d534645e8673ce14e1b0dde883299fae5c401ebd8dada86a8 WHIRLPOOL 2a5cf1994cb672d3b29eeabc9bfeed1f4fd38b0eac3675506f3547275078aa2ce406830efc691b8b7bca589598d55eb05bc3aadd093c49c6c80adc8ad3e738c9
+MISC ChangeLog 9320 SHA256 5804d72b5f4a15eefade515dc3b3e703d44d59384b5c6f42f293705d803ea8b7 SHA512 fb46133b47cb5dab9a496497860f12f721238171d0803b470febc15c82d85a3b14025e66eca32d9513dd16c23d2db46d08a9dbdb968e68a05e9d741026dcf5af WHIRLPOOL b6e62f1ddb12cf690c1edead265419f65d231dfcda5201533c78d1160ba85fda0c3b8a3701c6e26a6df7253f98cc888e1c257dade11831d4b2b55625af88621e
 MISC metadata.xml 695 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1 SHA512 19c4f1736767b4df3a0262d16a48b8c39aea5748ec7d6f87fde0231fcc26edf4b0953ba3d3ca0af226370481538958e1b37af91e4af4e6913d80d661ccaf3959 WHIRLPOOL 8c69f5f37908c5ed1d2c820a115e5a26a00282754424d0deadee1a05ff783ae8e62c08cb68c98030ca3f242a8fff8b475f1174cf7f9be441379956458376cea5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQK8HBAAoJELEHsLL7fEFW8dEP/2BCUCy6pwgGXmVOAIflXkjH
+kCyHl48vOZTiGvAr7LUKped3Oky9ReBNSzQEeGgkQZveWA2Sgvrldca2GzPjk+Fb
+02B0IsczF1aALu7tetE3Vwt9sDfvXzydtlQQD11NtS5TB+opL28bsH4f3tWd67fZ
+42ucENm56wSDfsZkxap7lrDXHExIpxfxel4mEn55BMDlOrpZGGt78R6Y/qc2AEbH
+vwn+VD/HlXvKnGk0Mq78EbnxuUZYII5gWI2S124FnyzD3bDi00GZwsyOVKa39RIa
+XwGu92mk/14dFe7zncyN1nKKfXPCk2AGqBphEgkVJe9Hda7cyEL41ohvBc4Uvmha
+YLKjUHyrBmRy909u+e+MlKSyEnKbyG8VHqhW4kLL08tNI/WOSBeO9yYxFaWXz0Hg
+FK4Fm5z9L68R24iBUAr1e3h8X/g3KyQgesZrXoCA34O14lpWGnZOwKaopDBMIXSP
+pVkirUoaLrHnDe5CB2ZWRARTCAKi/dkVmPccd0E63deAGGJ8QySJXRZfRT0/50m4
+c+smuTMtjPgggeEX2o+AqdDEUmrfuJ9umMcTpVznQF6uf4WcHHvkCMFIDnXDaA8I
+FLje6tS/rDwGFjrsvc1wc/G/Rw7eHdUvkiTqBkyWFGZYbdZHwrELXRIthZDleFLQ
+V9ir+t/kCMh+/OMuN/Up
+=uy3q
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch b/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch
new file mode 100644
index 000000000000..84d536f5054c
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch
@@ -0,0 +1,39 @@
+From b4ab43f12cc44a24e8161eb2d0857b78c756b18c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 14 Aug 2012 14:24:28 -0400
+Subject: [PATCH] do not error out on generic-gnu + --enable-shared
+
+If you build with --enabled-shared on a Linux arch not explicitly
+listed, the configure script will abort because it didn't detect
+"linux" in the fallback generic-gnu tuple.
+
+Since this is the fallback tuple and people are passing
+--enable-shared, assume the user knows what they're in for.
+
+Change-Id: Ia35b657e7247c8855e3a94fca424c9884d4241e3
+---
+ configure |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 2e19e5b..dde215f 100755
+--- a/configure
++++ b/configure
+@@ -454,7 +454,13 @@ process_detect() {
+         # Can only build shared libs on a subset of platforms. Doing this check
+         # here rather than at option parse time because the target auto-detect
+         # magic happens after the command line has been parsed.
+-        enabled linux || die "--enable-shared only supported on ELF for now"
++        if ! enabled linux; then
++            if enabled gnu; then
++                echo "--enable-shared is only supported on ELF; assuming this is OK"
++            else
++                die "--enable-shared only supported on ELF for now"
++            fi
++        fi
+     fi
+     if [ -z "$CC" ]; then
+         echo "Bypassing toolchain for environment detection."
+-- 
+1.7.9.7
+
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
index dea80bcce35d..9540a8181720 100644
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.11 2012/08/14 15:45:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.12 2012/08/15 15:35:23 vapier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs base
@@ -39,7 +39,10 @@ REQUIRED_USE="
 	sse2? ( mmx )
 	"
 
-PATCHES=( "${FILESDIR}/${P}-chost.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-chost.patch"
+	"${FILESDIR}/${P}-generic-gnu-shared.patch"
+)
 
 src_configure() {
 	#let the build system decide which AS to use (it honours $AS but