summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-09-28 23:21:06 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:46:19 +0100
commitec8dd98eb410cd49fa53904f0ea60bbd89696ebd (patch)
treedce7f1ade7c412726f24598e59e28f0691619b18
parentdd71f67db1dad2e0bd89313fcc11126a6ce15b84 (diff)
downloadpoky-ec8dd98eb410cd49fa53904f0ea60bbd89696ebd.tar.gz
Fix flac build on e500mc cores
This core does not have altivec, so we disable it in the build, also reestablish the config option to enable/disable building with altivec If SPE is not detected we always build with altivec which is wrong. This will check to make sure altivec is enabled and pass build options through accordingly (From OE-Core rev: 96241de59fdf548ae0f80cc9e4668f9ba11924ef) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch4
-rw-r--r--meta/recipes-multimedia/flac/flac_1.2.1.bb5
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch b/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
index 658e1903d2..5ca8b35142 100644
--- a/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch
@@ -39,15 +39,17 @@ diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
39index cbfb0ac..5785372 100644 39index cbfb0ac..5785372 100644
40--- a/src/libFLAC/Makefile.am 40--- a/src/libFLAC/Makefile.am
41+++ b/src/libFLAC/Makefile.am 41+++ b/src/libFLAC/Makefile.am
42@@ -40,8 +40,13 @@ if FLaC__SYS_DARWIN 42@@ -40,8 +40,15 @@ if FLaC__SYS_DARWIN
43 CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM 43 CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
44 else 44 else
45 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific 45 # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
46+CPUCFLAGS = 46+CPUCFLAGS =
47+if FLaC__CPU_PPC_SPE 47+if FLaC__CPU_PPC_SPE
48+else 48+else
49+if FLaC__USE_ALTIVEC
49+CPUCFLAGS += -maltivec -mabi=altivec 50+CPUCFLAGS += -maltivec -mabi=altivec
50+endif 51+endif
52+endif
51 #@@@ PPC optimizations temporarily disabled 53 #@@@ PPC optimizations temporarily disabled
52-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM 54-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
53+CPUCFLAGS += -DFLAC__NO_ASM 55+CPUCFLAGS += -DFLAC__NO_ASM
diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb
index 341047abb6..652d69a13d 100644
--- a/meta/recipes-multimedia/flac/flac_1.2.1.bb
+++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
14 file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48" 14 file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48"
15DEPENDS = "libogg" 15DEPENDS = "libogg"
16 16
17PR = "r1" 17PR = "r2"
18 18
19SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ 19SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
20 file://disable-xmms-plugin.patch \ 20 file://disable-xmms-plugin.patch \
@@ -36,6 +36,9 @@ EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
36 --without-xmms-exec-prefix \ 36 --without-xmms-exec-prefix \
37 --without-libiconv-prefix \ 37 --without-libiconv-prefix \
38 --without-id3lib" 38 --without-id3lib"
39EXTRA_OECONF_prepend_e500mc = "--disable-altivec "
40EXTRA_OECONF_prepend_e5500 = "--disable-altivec "
41EXTRA_OECONF_prepend_e5500-64b = "--disable-altivec "
39 42
40PACKAGES += "libflac libflac++ liboggflac liboggflac++" 43PACKAGES += "libflac libflac++ liboggflac liboggflac++"
41FILES_${PN} = "${bindir}/*" 44FILES_${PN} = "${bindir}/*"