mgorny 15/02/03 23:14:04 Modified: spandsp-0.0.6.ebuild ChangeLog Log: 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. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.4 media-libs/spandsp/spandsp-0.0.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/spandsp/spandsp-0.0.6.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/spandsp/spandsp-0.0.6.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/spandsp/spandsp-0.0.6.ebuild?r1=1.3&r2=1.4 Index: spandsp-0.0.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/spandsp/spandsp-0.0.6.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- spandsp-0.0.6.ebuild 29 Jan 2015 17:59:02 -0000 1.3 +++ spandsp-0.0.6.ebuild 3 Feb 2015 23:14:04 -0000 1.4 @@ -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 @@ 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 @@ 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 @@ $(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) } 1.37 media-libs/spandsp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/spandsp/ChangeLog?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/spandsp/ChangeLog?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/spandsp/ChangeLog?r1=1.36&r2=1.37 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/spandsp/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ChangeLog 29 Jan 2015 21:33:59 -0000 1.36 +++ ChangeLog 3 Feb 2015 23:14:04 -0000 1.37 @@ -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 <[email protected]> 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 <[email protected]> metadata.xml: Remove unused flag descriptions (replaced by global CPU_FLAGS_X86).
