Remove unused CPU flags that only implicitly enable other flags and cause the build...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/media-libs/spandsp/ChangeLog b/media-libs/spandsp/ChangeLog
index cce2267baa79270a799f50759d5d867ed6c0060d..f0ec9bc2aafcb4875eb4153f8219ec0289861389 100644 (file)
--- a/media-libs/spandsp/ChangeLog
+++ b/media-libs/spandsp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/spandsp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/spandsp/ChangeLog,v 1.36 2015/01/29 21:33:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/spandsp/ChangeLog,v 1.37 2015/02/03 23:14:04 mgorny Exp $
+
+  03 Feb 2015; Michał Górny <mgorny@gentoo.org> spandsp-0.0.6.ebuild:
+  Remove unused CPU flags that only implicitly enable other flags and cause the
+  build to fail. Add proper REQUIRED_USE for implicitly enabled instruction
+  sets. Bug #538710, fixes https://bugs.funtoo.org/browse/FL-2069.
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Remove unused flag descriptions (replaced by global CPU_FLAGS_X86).

diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index 6b3847d4c0e333d78bda9b112b02a2b2698e20d8..45af74c3bb21bfd5cc084db069fa4703dde0f4a3 100644 (file)
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -4,27 +4,27 @@ Hash: SHA256
 DIST spandsp-0.0.6.tar.gz 3309837 SHA256 cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4 WHIRLPOOL 83aad8c11aeb3e0686cd35d2987602e4d9f4001f29463ece18d6843be855ad32f9a3fd8cba2842a1c8dc9f91acde1b776400b4317c93d0201b9039b0990f500a
 DIST spandsp-0.0.6pre12.tgz 2566669 SHA256 81820ab80be853ecfea79b75e5b5cf592ff7083853cc22ced46d57da47f9d0e8 SHA512 19a7fe491b836fe604373aa2d31d4b35dde19e593a8f3d5d2a4b866ea69a137ba5ebfd43c34f74e8f7800a7eb1ba93d1a0401540e310bad2b73aecb17c45de0b WHIRLPOOL c7ddee4f308af16dd77b612df0ce339ff89c8ec80cb77139d460299a76e291c334315f0ee48a51a6a6af125f1dc0d824fcf43e03fb206a909b5fec159e1cbf01
 DIST spandsp-0.0.6pre21.tgz 3278758 SHA256 bd152152bf0b204661ab9439c5a649098bcb8cefebcbfa959dd602442739aa50 SHA512 6f846021cd6a1605d371a8e5d1ac3a5b6adc5b85de2517e24a5afaa57b4864202c2d16c1196959f7f11d866732d17d301d2d37121228cec75077678f8fc3e488 WHIRLPOOL e3c375888c562a933ca9be22a916d57b538ee702b77d0e4ce078eadd93e8701e1bcd76296ba6b88934888a4a3f5b6c216441a5e5f8aea8134984fe4213f38736
-EBUILD spandsp-0.0.6.ebuild 1771 SHA256 22c19ee324917699ca78f376b24c3d117bfd71c6ebd5733639db34d7cb57bdf8 SHA512 cae1f67010450dccaaf591dfa6d5688a4c635c01e2155585d0eb303fb42709ba467e5ad19e76a2e3cae1521e26ca2e6aad8d1a9e34220ab1b0049b8edc50ceae WHIRLPOOL 763d8c05cddea20c41d333127ef925b4cb166d3ad93db00c950896a65b2a84a9cf0b5611ca8ccc478da47833cd0b0d36335c1c3ca371f5da50645ebe8d44e092
+EBUILD spandsp-0.0.6.ebuild 2133 SHA256 21c8a37427710fa9ec98b46e12f4f88ad53560b650e7168c3c5e9d1edb9c4a78 SHA512 44cee93a13678f3bf56b0f7698ac1ab4c53c1826b44646cc5c0f028f2bb8cfe3d0d73d600b1af5a9fb9ea2dbd59d27d15717aee7b6c1488951ee237da7e4cb44 WHIRLPOOL 02c804f88324dbf3bff9340ff5bf29ac9b40d0b8b7ceb07d155b833c42599460cb63bfc55f3c4be52352996e344151f33017675d46bcedfedc760694dd6e284f
 EBUILD spandsp-0.0.6_pre12-r1.ebuild 1410 SHA256 878baccb0b775c8dfffd7bca5382cac2309f3fc99b5a5d93086b16370c693995 SHA512 de219e73a36a27442ab16e6785f3fa2ea28cb7792457d47d5249edad8a27a6db67e8e1f68c33cbb4d1b576da2a11e595757a6a6ab61b7db18ca833efaa0e1a85 WHIRLPOOL 0ee3eab53fe2e41b65afa554d7268fbe26a4113a46568961a59ea4f5c2a5583de8e609ad6fdbafc56d626693d49187e761917c7f18c4e8cc4a0213f551d5f07d
 EBUILD spandsp-0.0.6_pre21.ebuild 1533 SHA256 6711a722296770501c498e6e3c7f3bfa4db6d2a12682dcc52f190238e9c6901c SHA512 4ac41093bae2b2f90cdefcedd76237d2870440eea2519f997ffa5dce716dec66463ffd2c3509cbfa87eaaac91a520540a3aac1803e4371f9e0af061f6216033b WHIRLPOOL 9ba9735759fcea01164ba26686522df59749657a91521f1dac30204a7e205ae97acd13d4d60b82893012731ad1e50ffa483847ff75cc3301818f4291f43287b6
-MISC ChangeLog 6896 SHA256 24fc4f8e5d5c176376e0368276f42f115a1448bd195e9ffa51ed87015234a9a2 SHA512 d63ac6b1a331bf842c51adf34e422ff3f3c3e6730bb01cabb8e0f2997eab3270d87915c2fa6258d9dc25c2a1ecf537557b24de5b671c01609fe7cbd6f339e416 WHIRLPOOL 6b77921c30b7516271e23bddda7a9cd818a239b99aebd55a08fd8934610f4d87eada9e5b50dc8dca76d2b6cfe57b81fe72c6f038c91b1bcb9828edffe0313e5d
+MISC ChangeLog 7192 SHA256 42b0095042b3178454a9f60f7592a4b3fe22613986bfbae75f3d3f7a0dc42120 SHA512 53c5f2b2267b89a385426829d62f067c62857423ca7143e83bab21ec7a0f15c39efff253bebf4eb8e94ac25512f6ecdbec1e38882f19518d13737b811f0efe4a WHIRLPOOL d02b3144311aecde891618925bc029974afe2a0b5203c80354363ca456af5dd912b916cbc06a09a8d21ae2d2f065f7db7312bd82506c7866205957e8b4794812
 MISC metadata.xml 276 SHA256 1bd4dc946ba8fd9860d1cf2468594bed01351d2f5b0d17eb3865a183f0732f3e SHA512 90ef7b5c730035b104c2840adea99ab0ed41fa38e6c3422a7eba25c5cfbc7e4f8590c01181d5d9451278248ad661090728ac6b44b92f65e2373ca2ead9f0f32d WHIRLPOOL fc00ed6090baa48fd2e2508f73f6567ffdacc667217bad6ba8cb47011b9268539c21efa6e1f0ad0b3e6a793394a15fe0cb7e47f951b66fa6ae860fc36c36253b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyqdIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU0VY9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8a4QAL0czDSD1DryW0UZ0QORbvrX
-DAXDWweUIOk1jHP5gbtrgy2E1EC7A2rzTuW7eLxgvh5YMOf/Pxk+LG5KJFZjgqy5
-s8UxN/0Sm/8eVEly4vksVAHyqToMs0jhJ1uWiNaFPdqndHUNri09miuliqR9rb2e
-I7rt3wJYfeZmg8ju4NerqYIFIBWkNBL+0W3x1nBD7QEwa+EGK/+0xM+AIIwfpR9a
-oL+ORueNvix76zZ0VIHQ4o2NtFTkNqupSz6eZ53MKRgtxxKNyIoW0eSwmzEEOwtp
-hSFJFCdsI4CeO2hH7tbGrRMPkjwb2YdAtF6WT4Ju1uyGk7ZKFmVUbaiAmTNoPDs7
-HuYfZmiS44G7T8AFkUUYlLnkxQXjcuGP0NhlGhAjHy6BE2X7AX07A8kVkPxHEcBw
-jWzurW8Mjz5GNX5EXORqIv+EHpL/VsXW9lYlXv59gzmMjjEhHtvOBKnLx6Z6O0ce
-FTEB+DnrbfoWHWeD8PnVm5oRVfJKgqUhUWVQFoBqbH7fSn+F3Hd5UhiSbH3AOCu1
-m/2+3rErwnGc1RNsrBUlAbJn6SvdwcR8bAqmy0cqKiV/7CRBeuzdbA5okW4utfYn
-/U7/VLz+Tm0nG7e8XdVz+xGHHdQxySZ6k4xihmzSznN8NO8DjJsIRghtaTmj4mYY
-Z3bpVr8uHzuiCznG3LqT
-=Qo/Y
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOhJ8QAM0BBYPQn0sdpSAig4CZLTrk
+ewM87S2J4ONocLpnIfMiRVoMAo8DrILoHAHf4kuKM8NXXk1izUX51Dg64xm89UT/
+6CxtfQEWbs+6+E0cbEIEsD85SBNrc+fMXawBwP2phvJ0R1FkF/5Wx85CUMjmmeGR
+Fi8KoeQaXx8m6uplD6ONr7wcyCElOr85p0HED9QKL/KAnI/0oC1P3h8rPZcW88gk
+pBTS/oAiZw9/8AaiBR36JiOk+H48SwGBYF4FH7m+Ii3H0YoLJmgR4sveecKqIyKM
+lrlSD2/MAR+prDQQMSolzGsY5VBSkKXufUqj+qQ0zvfRwa4cxraXrS7p8WtXhQNk
+Cl3Zrrp1wrWVLsAXFMfXdJfMtQmYQi1gpSKUjn3oKU3IAwFyV4Y315ZHfr5nHbug
+sczPV+MuCy9M6iplJvcvPQO33ah4suUzl7RJoU0gLkV9y1uzZjEhNDbpMjE1hyH9
+/wXV4mXWIJWNu0uBBry+FTprB4xiIBEs7N5TeGn4OhhNclkSKhH1zV6tDVzDx7aM
+z2yExm97mm/PzY3vsLXT8v31dwPXcKmzj5uPIXx+3WYM3zqIitnr3Ldov9II2rDr
+fWt+tCDR/rTP+6uS5Mo6+3FXgE0qn6pwiUC9nsO4jSGdChlGexrG6RPgjKl5+X/Q
+owdWfn1t2n5sh8yDlIc6
+=NHa/
 -----END PGP SIGNATURE-----

diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
index a7b0d47f6e6bfaadcf1b82f4ff97c843d5104ebc..6586fea4ad2b29c82fd3f5133b45953652ad4c87 100644 (file)
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6.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/media-libs/spandsp/spandsp-0.0.6.ebuild,v 1.3 2015/01/29 17:59:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/spandsp/spandsp-0.0.6.ebuild,v 1.4 2015/02/03 23:14:04 mgorny Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4a cpu_flags_x86_avx static-libs"
+IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs"
 
 RDEPEND="media-libs/tiff
         virtual/jpeg"
@@ -21,14 +21,27 @@ DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen
                dev-libs/libxslt )"
 
+# Enabled implicitly by the build system. Really useless.
+REQUIRED_USE="
+       cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+       cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
+       cpu_flags_x86_sse? ( cpu_flags_x86_mmx )"
+
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
 
 # TODO:
 # there are two tests options: tests and test-data
 #      they need audiofile, fftw, libxml and probably more
-# configure script is auto-enabling some sse* options sometimes
 
 src_configure() {
+       # Note: flags over sse3 aren't really used -- they're only
+       # boilerplate. They also make some silly assumptions, e.g. that
+       # every CPU with SSE4* has SSSE3.
+       # Reference: https://bugs.funtoo.org/browse/FL-2069.
+       # If you want to re-add them, first check if the code started
+       # using them. If it did, figure out if the flags can be unbundled
+       # from one another. Otherwise, you'd have to do REQUIRED_USE.
+
        econf \
                --disable-dependency-tracking \
                $(use_enable doc) \
@@ -37,9 +50,6 @@ src_configure() {
                $(use_enable cpu_flags_x86_sse sse) \
                $(use_enable cpu_flags_x86_sse2 sse2) \
                $(use_enable cpu_flags_x86_sse3 sse3) \
-               $(use_enable cpu_flags_x86_ssse3 ssse3) \
-               $(use_enable cpu_flags_x86_sse4a sse4a) \
-               $(use_enable cpu_flags_x86_avx avx) \
                $(use_enable static-libs static)
 }