From 69f1d464773718faeb01e576769c51db5088aba4 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 2 Feb 2014 11:01:47 +0000
Subject: [PATCH] packages/libflac: don't hardcode altivec options in CPUCFLAGS

The '-maltivec' and '-mabi=altivec' options always
included in the CPUCPFLAGS variable, even if altivec
support is disabled. This causes build failure on
powerpc platforms without altivec support:

  bitmath.c:1:0: error: AltiVec and E500 instructions cannot coexist

Update the src/libFLAC/Makefile.am template to skip
altivec options if 'FLaC__USE_ALTIVEC' is not used.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39443
---
 .../020-libFLAC-remove-altivec-options.patch  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 libs/flac/patches/020-libFLAC-remove-altivec-options.patch

diff --git a/libs/flac/patches/020-libFLAC-remove-altivec-options.patch b/libs/flac/patches/020-libFLAC-remove-altivec-options.patch
new file mode 100644
index 0000000000..bc986724c9
--- /dev/null
+++ b/libs/flac/patches/020-libFLAC-remove-altivec-options.patch
@@ -0,0 +1,62 @@
+--- a/src/libFLAC/Makefile.in
++++ b/src/libFLAC/Makefile.in
+@@ -66,6 +66,7 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@@FLaC__USE_ALTIVEC_TRUE@am__append_1 = -maltivec -mabi=altivec
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -234,13 +235,21 @@ target_alias = @target_alias@
+ 
+ lib_LTLIBRARIES = libFLAC.la
+ @DEBUG_TRUE@DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
++# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
++#@@@ PPC optimizations temporarily disabled
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS =  \
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@	$(am__append_1) \
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@	-DFLAC__NO_ASM
++
++# FIXME: The following logic should be part of configure, not of Makefile.am
++
+ # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
+ # into cpu.c with an asm().
+ #@@@ PPC optimizations temporarily disabled
+-@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+-# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+-#@@@ PPC optimizations temporarily disabled
+-@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec \
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@	-force_cpusubtype_ALL \
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@	-DFLAC__NO_ASM \
++@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@	$(am__append_1)
+ 
+ AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
+ @FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ppc
+--- a/src/libFLAC/Makefile.am
++++ b/src/libFLAC/Makefile.am
+@@ -32,6 +32,9 @@ lib_LTLIBRARIES = libFLAC.la
+ if DEBUG
+ DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
+ endif
++
++# FIXME: The following logic should be part of configure, not of Makefile.am
++
+ if FLaC__CPU_PPC
+ # The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
+ # into cpu.c with an asm().
+@@ -40,8 +43,12 @@ if FLaC__SYS_DARWIN
+ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+ else
+ # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
++CPUCFLAGS =
++if FLaC__USE_ALTIVEC
++CPUCFLAGS += -maltivec -mabi=altivec
++endif
+ #@@@ PPC optimizations temporarily disabled
+-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
++CPUCFLAGS += -DFLAC__NO_ASM
+ endif
+ endif
+ 
-- 
2.30.2