[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 67b67cb3f48e8a33ffca2f60f8a4b38c2ba5b09f..f4169f74d306cfbca49853e716f6206a3fbbd515 100644 (file)
--- a/libs/libmad/Makefile
+++ b/libs/libmad/Makefile
@@ -1,24 +1,23 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmad
 PKG_VERSION:=0.15.1b
-PKG_RELEASE:=1
+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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -47,31 +46,32 @@ define Package/libmad/description
        Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
 endef
 
-CONFIGURE_ARGS += \
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
        --enable-fpm="$(FPM)" \
        --disable-debugging \
        --enable-speed \
 
-MAKE_FLAGS += \
+# 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)" \
-       DESTDIR="$(PKG_INSTALL_DIR)" \
-       all install
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/mad.h \
-               $(STAGING_DIR)/usr/lib/libmad.{a,so*}
-endef
-
 define Package/libmad/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/