diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-02-23 14:57:44 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-23 14:57:44 +0000 |
| commit | 32a44f4775a4014e6cda71a28c1b20fb75622061 (patch) | |
| tree | f91d0c3754ce06683471c778d2d19c4a438ee783 /meta | |
| parent | e3eb1286e10764ca4ea64b9b58ad2e8bcfe913c9 (diff) | |
| download | openembedded-core-contrib-32a44f4775a4014e6cda71a28c1b20fb75622061.tar.gz | |
a52dec: Clean up CFLAGS
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/liba52/liba52/buildcleanup.patch | 87 | ||||
| -rw-r--r-- | meta/packages/liba52/liba52_0.7.4.bb | 5 |
2 files changed, 90 insertions, 2 deletions
diff --git a/meta/packages/liba52/liba52/buildcleanup.patch b/meta/packages/liba52/liba52/buildcleanup.patch new file mode 100644 index 0000000000..a86c5a8e37 --- /dev/null +++ b/meta/packages/liba52/liba52/buildcleanup.patch @@ -0,0 +1,87 @@ +It makes much more sense to control our own CFLAGS and avoiding fPIC breaks +some arches too. Assume we know what we're doing and remove all the messing +around. + +RP 23/2/10 + +Index: a52dec-0.7.4/configure.in +=================================================================== +--- a52dec-0.7.4.orig/configure.in 2010-02-23 14:51:50.000000000 +0000 ++++ a52dec-0.7.4/configure.in 2010-02-23 14:52:36.000000000 +0000 +@@ -14,62 +14,6 @@ + AC_PROG_CC + AC_PROG_GCC_TRADITIONAL + +-if test x"$GCC" = x"yes"; then +- +- dnl GCC-specific flags - try to optimize them sometime +- dnl -Wall -Werror moved to the end to not disturb the configure script +- +- dnl -O3 +- changequote(<<,>>) +- OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"` +- changequote([,]) +- OPT_CFLAGS="$OPT_CFLAGS -O3" +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) +- +- dnl -fomit-frame-pointer +- OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) +- +- dnl arch-specific flags +- case "$host" in +- i?86-* | k?-*) +- case "$host" in +- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; +- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; +- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; +- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; +- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; +- esac +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; +- sparc-* | sparc64-*) +- OPT_CFLAGS="$CFLAGS -mtune=ultrasparc" +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; +- mips-sgi-irix6.*) dnl do we need to be that specific ? +- OPT_CFLAGS="$CFLAGS -mabi=64" +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; +- esac +-elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then +- dnl TenDRA portability checking compiler +- TENDRA=yes +- CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE" +- enable_mlib=no +- enable_oss=no +- enable_solaris_audio=no +-elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then +- dnl Intel C++ compiler +- CFLAGS="-g -O3 -unroll -ip" +-else +- dnl non-gcc flags - we probably need exact configuration triplets here. +- case "$host" in +- mips-sgi-irix6.*) +- OPT_CFLAGS="$CFLAGS -64" +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; +- sparc-sun-solaris*) +- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" +- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; +- esac +-fi +- + dnl Checks for libtool - this must be done after we set cflags + AC_DISABLE_SHARED + AC_LIBTOOL_WIN32_DLL +Index: a52dec-0.7.4/liba52/configure.incl +=================================================================== +--- a52dec-0.7.4.orig/liba52/configure.incl 2010-02-23 14:51:44.000000000 +0000 ++++ a52dec-0.7.4/liba52/configure.incl 2010-02-23 14:51:59.000000000 +0000 +@@ -1,9 +1,6 @@ + AC_SUBST([LIBA52_CFLAGS]) + AC_SUBST([LIBA52_LIBS]) + +-dnl avoid -fPIC when possible +-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" +- + AC_ARG_ENABLE([double], + [ --enable-double use double-precision samples]) + if test x"$enable_double" = x"yes"; then diff --git a/meta/packages/liba52/liba52_0.7.4.bb b/meta/packages/liba52/liba52_0.7.4.bb index 6f987e63c6..8ed243fbcb 100644 --- a/meta/packages/liba52/liba52_0.7.4.bb +++ b/meta/packages/liba52/liba52_0.7.4.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Library for reading some sort of media format." LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" -PR = "r1" +PR = "r2" inherit autotools -SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz" +SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \ + file://buildcleanup.patch;patch=1" S = "${WORKDIR}/a52dec-${PV}" EXTRA_OECONF = " --enable-shared " |