[packages] mpdas: fix mpdas linking against libiconv & libintl
authorNicolas Thill <nico@openwrt.org>
Thu, 24 Dec 2009 06:44:40 +0000 (06:44 +0000)
committerNicolas Thill <nico@openwrt.org>
Thu, 24 Dec 2009 06:44:40 +0000 (06:44 +0000)
SVN-Revision: 18917

sound/mpdas/Makefile
sound/mpdas/patches/001-flags.patch [new file with mode: 0644]

index ad21cf2..79f267c 100644 (file)
@@ -32,9 +32,17 @@ define Package/mpdas/description
     cache the played songs to ~/.mpdascache.
 endef
 
+EXTRA_CPPFLAGS:=\
+       -I$(STAGING_DIR)/usr/lib/libintl/include \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include \
+
+EXTRA_LDFLAGS:=\
+       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
+
 MAKE_FLAGS += \
-       $(TARGET_CONFIGURE_OPTS) \
-       $(1) \
+       CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+       LDFLAGS="$(TARGET_LDPFLAGS) $(EXTRA_LDFLAGS)" \
 
 define Package/mpdas/install
        $(INSTALL_DIR) $(1)/etc
diff --git a/sound/mpdas/patches/001-flags.patch b/sound/mpdas/patches/001-flags.patch
new file mode 100644 (file)
index 0000000..f136683
--- /dev/null
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -7,8 +7,8 @@ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/man/man1
+ CONFIG = $(PREFIX)/etc
+-CXXFLAGS      += `pkg-config --cflags libmpd libcurl` 
+-LIBS          = `pkg-config --libs libmpd libcurl`
++CXXFLAGS      += $(CPPFLAGS) `pkg-config --cflags libmpd libcurl` 
++LIBS          = $(LDFLAGS) `pkg-config --libs libmpd libcurl`
+ CXXFLAGS      += -DCONFDIR="\"$(CONFIG)\"" -DVERSION="\"$(VERSION)\""