diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-01-06 15:41:59 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-01-10 22:24:43 +0100 |
| commit | 8e2fd818870882158dab4c3aa4c1fdac11211fd5 (patch) | |
| tree | 9b28d9fd43ba86cc9bfb7e728f8590b0b3fb4c01 /package | |
| parent | 3209c12ffea696072ecebc703f858112992fae7a (diff) | |
flac: fix powerpc build
flac incorrectly assumes every powerpc around has altivec.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/multimedia/flac/flac-no-altivec.patch | 28 | ||||
| -rw-r--r-- | package/multimedia/flac/flac.mk | 2 |
2 files changed, 28 insertions, 2 deletions
diff --git a/package/multimedia/flac/flac-no-altivec.patch b/package/multimedia/flac/flac-no-altivec.patch new file mode 100644 index 000000000..c6a535b00 --- /dev/null +++ b/package/multimedia/flac/flac-no-altivec.patch @@ -0,0 +1,28 @@ +FLAC assumes every powerpc around has altivec ABI which is wrong. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura flac-1.2.1/src/libFLAC/Makefile.am flac-1.2.1-noaltivec/src/libFLAC/Makefile.am +--- flac-1.2.1/src/libFLAC/Makefile.am 2007-09-14 18:06:17.000000000 -0300 ++++ flac-1.2.1-noaltivec/src/libFLAC/Makefile.am 2011-01-06 15:14:36.384242614 -0300 +@@ -41,7 +41,7 @@ + else + # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific + #@@@ PPC optimizations temporarily disabled +-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM ++CPUCFLAGS = -DFLAC__NO_ASM + endif + endif + +diff -Nura flac-1.2.1/src/libFLAC/Makefile.in flac-1.2.1-noaltivec/src/libFLAC/Makefile.in +--- flac-1.2.1/src/libFLAC/Makefile.in 2007-09-16 17:05:12.000000000 -0300 ++++ flac-1.2.1-noaltivec/src/libFLAC/Makefile.in 2011-01-06 15:14:50.997545602 -0300 +@@ -240,7 +240,7 @@ + @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_FALSE@CPUCFLAGS = -DFLAC__NO_ASM + + AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@ + @FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ppc diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk index a11924aec..dbaf2e9ef 100644 --- a/package/multimedia/flac/flac.mk +++ b/package/multimedia/flac/flac.mk @@ -7,8 +7,6 @@ FLAC_VERSION = 1.2.1 FLAC_SOURCE = flac-$(FLAC_VERSION).tar.gz FLAC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/flac/ -FLAC_AUTORECONF = NO -FLAC_INSTALL_TARGET = YES FLAC_INSTALL_STAGING = YES FLAC_CONF_OPT = \ |