From ec8dd98eb410cd49fa53904f0ea60bbd89696ebd Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Wed, 28 Sep 2011 23:21:06 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-multimedia/flac/flac-1.2.1/0001-No-AltiVec-on-SPE.patch | 4 +++- meta/recipes-multimedia/flac/flac_1.2.1.bb | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia/flac') 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,14 +39,16 @@ diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index cbfb0ac..5785372 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am -@@ -40,8 +40,13 @@ if FLaC__SYS_DARWIN +@@ -40,8 +40,15 @@ 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__CPU_PPC_SPE +else ++if FLaC__USE_ALTIVEC +CPUCFLAGS += -maltivec -mabi=altivec ++endif +endif #@@@ PPC optimizations temporarily disabled -CPUCFLAGS = -maltivec -mabi=altivec -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 \ file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48" DEPENDS = "libogg" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ file://disable-xmms-plugin.patch \ @@ -36,6 +36,9 @@ EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ --without-xmms-exec-prefix \ --without-libiconv-prefix \ --without-id3lib" +EXTRA_OECONF_prepend_e500mc = "--disable-altivec " +EXTRA_OECONF_prepend_e5500 = "--disable-altivec " +EXTRA_OECONF_prepend_e5500-64b = "--disable-altivec " PACKAGES += "libflac libflac++ liboggflac liboggflac++" FILES_${PN} = "${bindir}/*" -- cgit v1.2.3-54-g00ecf