From e8bbfe4d9373fbe78109aa4450ac03ba7163587b Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 4 Apr 2010 14:40:07 +0000
Subject: [PATCH] libmad: fix build failure on targets using -O2 optimizations
 (partially closes: #6974)

SVN-Revision: 20699
---
 libs/libmad/Makefile | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile
index 79cb31557..f4169f74d 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
-- 
2.30.2