From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 4 Apr 2010 14:40:07 +0000 (+0000)
Subject: [packages] libmad: fix build failure on targets using -O2 optimizations (partially... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5da9184fbb35cd435e7d7544ffdf26cef78f1989;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] libmad: fix build failure on targets using -O2 optimizations (partially closes: #6974)


SVN-Revision: 20699
---

diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile
index 79cb315578..f4169f74d3 100644
--- a/libs/libmad/Makefile
+++ b/libs/libmad/Makefile
@@ -48,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