[packages] libmad: fix build failure on targets using -O2 optimizations (partially...

[openwrt/svn-archive/archive.git] / libs / libmad / Makefile

diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile
index 318519c0c2357207d590b5dcd47181a8f554b6cf..f4169f74d306cfbca49853e716f6206a3fbbd515 100644 (file)
--- a/libs/libmad/Makefile
+++ b/libs/libmad/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmad
 PKG_VERSION:=0.15.1b
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad \
        ftp://ftp.mars.org/pub/mpeg/
 PKG_MD5SUM:=1be543bc30c56fb6bea1d7bf6a64e66c
 
+PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -47,15 +48,22 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --enable-fpm="$(FPM)" \
-               --disable-debugging \
-               --enable-speed \
-       )
-endef
+CONFIGURE_ARGS+= \
+       --enable-shared \
+       --enable-static \
+       --enable-fpm="$(FPM)" \
+       --disable-debugging \
+       --enable-speed \
+
+# XXX: configure is parsing and "optimizing" CFLAGS, adding unsupported 
+# XXX: compiler args to it (like -fforce-mem)
+# XXX: so pass an empty one to configure
+CONFIGURE_VARS+= \
+       CFLAGS="" \
+
+# XXX: and pass our own to make
+MAKE_FLAGS+= \
+       CFLAGS="$(TARGET_CFLAGS)" \
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include