media-sound/wavpack: Restrict arm asm to armv7, bug #609168.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch b/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch
new file mode 100644 (file)
index 0000000..80da2bf
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch
@@ -0,0 +1,16 @@
+ARM asm is armv7 only in wavpack. Restrict based on host cpu.
+https://bugs.gentoo.org/show_bug.cgi?id=609168
+
+Index: wavpack-5.1.0/configure.ac
+===================================================================
+--- wavpack-5.1.0.orig/configure.ac
++++ wavpack-5.1.0/configure.ac
+@@ -159,7 +159,7 @@ AS_IF([test "x$enable_asm" != "xno"],[
+   AS_CASE([$host_cpu],
+     [i386|i486|i586|i686|i786], [AC_DEFINE([OPT_ASM_X86]) asm_selected=x86],
+     [x86_64], [AC_DEFINE([OPT_ASM_X64]) asm_selected=x64],
+-    [arm*], [AC_DEFINE([OPT_ASM_ARM]) asm_selected=arm],
++    [armv7*], [AC_DEFINE([OPT_ASM_ARM]) asm_selected=arm],
+     [AS_IF([test "x$enable_asm" = "xyes"],[AC_MSG_ERROR(no assembly code for CPU $host_cpu)])]
+   )
+   AC_MSG_RESULT($asm_selected)

diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
index 1d06a9692d6fa810e9da623803b3bfd6e80cd6ef..51205b40a0a604dc758a519f458b44d4216646cb 100644 (file)
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+AUTOTOOLS_AUTORECONF=yes
 inherit autotools-multilib
 
 DESCRIPTION="Hybrid lossless audio compression tools"
@@ -21,6 +22,7 @@ RDEPEND=">=virtual/libiconv-0-r1
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )
+PATCHES=( "${FILESDIR}/${P}-armv7.patch" )
 
 multilib_src_configure() {
        local myeconfargs=(