Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | It makes much more sense to control our own CFLAGS and avoiding fPIC breaks |
| 2 | some arches too. Assume we know what we're doing and remove all the messing |
| 3 | around. |
| 4 | |
| 5 | RP 23/2/10 |
| 6 | |
| 7 | Upstream-Status: Inappropriate [configuration] |
| 8 | |
| 9 | Index: a52dec-0.7.4/configure.in |
| 10 | =================================================================== |
| 11 | --- a52dec-0.7.4.orig/configure.in 2010-02-23 14:51:50.000000000 +0000 |
| 12 | +++ a52dec-0.7.4/configure.in 2010-02-23 14:52:36.000000000 +0000 |
| 13 | @@ -14,62 +14,6 @@ |
| 14 | AC_PROG_CC |
| 15 | AC_PROG_GCC_TRADITIONAL |
| 16 | |
| 17 | -if test x"$GCC" = x"yes"; then |
| 18 | - |
| 19 | - dnl GCC-specific flags - try to optimize them sometime |
| 20 | - dnl -Wall -Werror moved to the end to not disturb the configure script |
| 21 | - |
| 22 | - dnl -O3 |
| 23 | - changequote(<<,>>) |
| 24 | - OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"` |
| 25 | - changequote([,]) |
| 26 | - OPT_CFLAGS="$OPT_CFLAGS -O3" |
| 27 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) |
| 28 | - |
| 29 | - dnl -fomit-frame-pointer |
| 30 | - OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" |
| 31 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) |
| 32 | - |
| 33 | - dnl arch-specific flags |
| 34 | - case "$host" in |
| 35 | - i?86-* | k?-*) |
| 36 | - case "$host" in |
| 37 | - i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; |
| 38 | - i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; |
| 39 | - i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; |
| 40 | - i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; |
| 41 | - k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; |
| 42 | - esac |
| 43 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; |
| 44 | - sparc-* | sparc64-*) |
| 45 | - OPT_CFLAGS="$CFLAGS -mtune=ultrasparc" |
| 46 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; |
| 47 | - mips-sgi-irix6.*) dnl do we need to be that specific ? |
| 48 | - OPT_CFLAGS="$CFLAGS -mabi=64" |
| 49 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; |
| 50 | - esac |
| 51 | -elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then |
| 52 | - dnl TenDRA portability checking compiler |
| 53 | - TENDRA=yes |
| 54 | - CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE" |
| 55 | - enable_mlib=no |
| 56 | - enable_oss=no |
| 57 | - enable_solaris_audio=no |
| 58 | -elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then |
| 59 | - dnl Intel C++ compiler |
| 60 | - CFLAGS="-g -O3 -unroll -ip" |
| 61 | -else |
| 62 | - dnl non-gcc flags - we probably need exact configuration triplets here. |
| 63 | - case "$host" in |
| 64 | - mips-sgi-irix6.*) |
| 65 | - OPT_CFLAGS="$CFLAGS -64" |
| 66 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; |
| 67 | - sparc-sun-solaris*) |
| 68 | - OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" |
| 69 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; |
| 70 | - esac |
| 71 | -fi |
| 72 | - |
| 73 | dnl Checks for libtool - this must be done after we set cflags |
| 74 | AC_DISABLE_SHARED |
| 75 | AC_LIBTOOL_WIN32_DLL |
| 76 | Index: a52dec-0.7.4/liba52/configure.incl |
| 77 | =================================================================== |
| 78 | --- a52dec-0.7.4.orig/liba52/configure.incl 2010-02-23 14:51:44.000000000 +0000 |
| 79 | +++ a52dec-0.7.4/liba52/configure.incl 2010-02-23 14:51:59.000000000 +0000 |
| 80 | @@ -1,9 +1,6 @@ |
| 81 | AC_SUBST([LIBA52_CFLAGS]) |
| 82 | AC_SUBST([LIBA52_LIBS]) |
| 83 | |
| 84 | -dnl avoid -fPIC when possible |
| 85 | -LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" |
| 86 | - |
| 87 | AC_ARG_ENABLE([double], |
| 88 | [ --enable-double use double-precision samples]) |
| 89 | if test x"$enable_double" = x"yes"; then |