libmad: Fix build.

diff --git a/lfs/libmad b/lfs/libmad
index 548374da07c86b0adfb2ecbc49582620dd449f6e..932d8c111fbd302e57b42fbb8bf315ac7ffa9bd0 100644 (file)
--- a/lfs/libmad
+++ b/lfs/libmad
@@ -77,6 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libmad-0.15.1b-cflags.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libmad-0.15.1b-cflags-O2.patch
+       cd $(DIR_APP) && autoreconf -vfi
+
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install

diff --git a/src/patches/libmad-0.15.1b-cflags-O2.patch b/src/patches/libmad-0.15.1b-cflags-O2.patch
new file mode 100644 (file)
index 0000000..61b4b13
--- /dev/null
+++ b/src/patches/libmad-0.15.1b-cflags-O2.patch
@@ -0,0 +1,12 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac   2007-07-01 12:58:13.000000000 -0600
++++ libmad-0.15.1b/configure.ac        2007-07-01 12:59:13.000000000 -0600
+@@ -105,7 +105,7 @@
+           shift
+           ;;
+       -O2)
+-          optimize="-O"
++          optimize="-O2"
+           shift
+           ;;
+       -fomit-frame-pointer)

diff --git a/src/patches/libmad-0.15.1b-cflags.patch b/src/patches/libmad-0.15.1b-cflags.patch
new file mode 100644 (file)
index 0000000..2ec44e3
--- /dev/null
+++ b/src/patches/libmad-0.15.1b-cflags.patch
@@ -0,0 +1,146 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac   2007-06-30 20:22:31.000000000 -0600
++++ libmad-0.15.1b/configure.ac        2007-06-30 20:25:31.000000000 -0600
+@@ -122,74 +122,74 @@
+     esac
+ done
+ 
+-if test "$GCC" = yes
+-then
+-    if test -z "$arch"
+-    then
+-      case "$host" in
+-          i386-*)           ;;
+-          i?86-*)           arch="-march=i486" ;;
+-          arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
+-          armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
+-          powerpc-*)        ;;
+-          mips*-agenda-*)   arch="-mcpu=vr4100" ;;
+-          mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+-      esac
+-    fi
+-
+-    case "$optimize" in
+-      -O|"-O "*)
+-          optimize="-O"
+-          optimize="$optimize -fforce-mem"
+-          optimize="$optimize -fforce-addr"
+-          : #x optimize="$optimize -finline-functions"
+-          : #- optimize="$optimize -fstrength-reduce"
+-          optimize="$optimize -fthread-jumps"
+-          optimize="$optimize -fcse-follow-jumps"
+-          optimize="$optimize -fcse-skip-blocks"
+-          : #x optimize="$optimize -frerun-cse-after-loop"
+-          : #x optimize="$optimize -frerun-loop-opt"
+-          : #x optimize="$optimize -fgcse"
+-          optimize="$optimize -fexpensive-optimizations"
+-          optimize="$optimize -fregmove"
+-          : #* optimize="$optimize -fdelayed-branch"
+-          : #x optimize="$optimize -fschedule-insns"
+-          optimize="$optimize -fschedule-insns2"
+-          : #? optimize="$optimize -ffunction-sections"
+-          : #? optimize="$optimize -fcaller-saves"
+-          : #> optimize="$optimize -funroll-loops"
+-          : #> optimize="$optimize -funroll-all-loops"
+-          : #x optimize="$optimize -fmove-all-movables"
+-          : #x optimize="$optimize -freduce-all-givs"
+-          : #? optimize="$optimize -fstrict-aliasing"
+-          : #* optimize="$optimize -fstructure-noalias"
+-
+-          case "$host" in
+-              arm*-*)
+-                  optimize="$optimize -fstrength-reduce"
+-                  ;;
+-              mips*-*)
+-                  optimize="$optimize -fstrength-reduce"
+-                  optimize="$optimize -finline-functions"
+-                  ;;
+-              i?86-*)
+-                  optimize="$optimize -fstrength-reduce"
+-                  ;;
+-              powerpc-apple-*)
+-                  # this triggers an internal compiler error with gcc2
+-                  : #optimize="$optimize -fstrength-reduce"
+-
+-                  # this is really only beneficial with gcc3
+-                  : #optimize="$optimize -finline-functions"
+-                  ;;
+-              *)
+-                  # this sometimes provokes bugs in gcc 2.95.2
+-                  : #optimize="$optimize -fstrength-reduce"
+-                  ;;
+-          esac
+-          ;;
+-    esac
+-fi
++#if test "$GCC" = yes
++#then
++#    if test -z "$arch"
++#    then
++#     case "$host" in
++#         i386-*)           ;;
++#         i?86-*)           arch="-march=i486" ;;
++#         arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
++#         armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
++#         powerpc-*)        ;;
++#         mips*-agenda-*)   arch="-mcpu=vr4100" ;;
++#         mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
++#     esac
++#    fi
++#
++#    case "$optimize" in
++#     -O|"-O "*)
++#         optimize="-O"
++#         optimize="$optimize -fforce-mem"
++#         optimize="$optimize -fforce-addr"
++#         : #x optimize="$optimize -finline-functions"
++#         : #- optimize="$optimize -fstrength-reduce"
++#         optimize="$optimize -fthread-jumps"
++#         optimize="$optimize -fcse-follow-jumps"
++#         optimize="$optimize -fcse-skip-blocks"
++#         : #x optimize="$optimize -frerun-cse-after-loop"
++#         : #x optimize="$optimize -frerun-loop-opt"
++#         : #x optimize="$optimize -fgcse"
++#         optimize="$optimize -fexpensive-optimizations"
++#         optimize="$optimize -fregmove"
++#         : #* optimize="$optimize -fdelayed-branch"
++#         : #x optimize="$optimize -fschedule-insns"
++#         optimize="$optimize -fschedule-insns2"
++#         : #? optimize="$optimize -ffunction-sections"
++#         : #? optimize="$optimize -fcaller-saves"
++#         : #> optimize="$optimize -funroll-loops"
++#         : #> optimize="$optimize -funroll-all-loops"
++#         : #x optimize="$optimize -fmove-all-movables"
++#         : #x optimize="$optimize -freduce-all-givs"
++#         : #? optimize="$optimize -fstrict-aliasing"
++#         : #* optimize="$optimize -fstructure-noalias"
++#
++#         case "$host" in
++#             arm*-*)
++#                 optimize="$optimize -fstrength-reduce"
++#                 ;;
++#             mips*-*)
++#                 optimize="$optimize -fstrength-reduce"
++#                 optimize="$optimize -finline-functions"
++#                 ;;
++#             i?86-*)
++#                 optimize="$optimize -fstrength-reduce"
++#                 ;;
++#             powerpc-apple-*)
++#                 # this triggers an internal compiler error with gcc2
++#                 : #optimize="$optimize -fstrength-reduce"
++#
++#                 # this is really only beneficial with gcc3
++#                 : #optimize="$optimize -finline-functions"
++#                 ;;
++#             *)
++#                 # this sometimes provokes bugs in gcc 2.95.2
++#                 : #optimize="$optimize -fstrength-reduce"
++#                 ;;
++#         esac
++#         ;;
++#    esac
++#fi
+ 
+ case "$host" in
+     mips*-agenda-*)