remove iconv dependancy when not absolutely required

SVN-Revision: 7512

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index d63c40029a9a3d048ec330acb8f40274db1bbeb2..168d552deec427788506c7bdb6c038578b52c9fe 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -49,7 +49,6 @@ endef
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib/libiconv/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/lib/libiconv/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/
 endef

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 3dd6d28e8b2e2eb1fe028ee173c11bddee809156..b4fbf973036650c03fde2b76c388f8ef7bc11c6c 100644 (file)
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -37,7 +37,7 @@ define Build/Configure
                --with-debug=0 \
                --with-libgnutls-prefix=$(STAGING_DIR)/usr \
                --without-doc-xsl-prefix \
-               --without-libiconv-prefix \
+               --with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
                --without-libintl-prefix \
                --disable-aspell \
                --enable-lua \
@@ -47,7 +47,7 @@ define Build/Configure
                --disable-python \
                --disable-ruby \
                , \
-               LIBS="-llua -ldl -lm" \
+               LIBS="-llua -ldl -lm -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
        )
 endef
 

diff --git a/sound/mpc/Makefile b/sound/mpc/Makefile
index 3cca30b2ae3f432ded4c1757f6346741f9665a62..bf744d05ae4877eea0bb50f949e7519c205326b3 100644 (file)
--- a/sound/mpc/Makefile
+++ b/sound/mpc/Makefile
@@ -25,7 +25,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/mpc
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libiconv
   TITLE:=Music Player Daemon Console Client
   DESCRIPTION:=\
        MPD is a music player supporting flac, mp3 and ogg files.\\\

diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile
index fba07251efbe1a648f778c4de90db57604c389fa..950d4eca922c13af30b8d204176bf6fb15665b8e 100644 (file)
--- a/utils/apr-util/Makefile
+++ b/utils/apr-util/Makefile
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/apr-util
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libiconv +libexpat +apr
+  DEPENDS:=+libexpat +apr
   TITLE:=Apache Portable Runtime Library Util
   URL:=http://apr.apache.org/
 endef
@@ -60,7 +60,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-       rm      $(STAGING_DIR)/usr/bin/apu-config \
+       -rm     $(STAGING_DIR)/usr/bin/apu-config \
                $(STAGING_DIR)/usr/include/apr-0/{apr_anylock.h,apr_base64.h,apr_buckets.h,apr_date.h,apr_dbm.h,apr_hooks.h,apr_ldap.h,apr_ldap_url.h,apr_md4.h,apr_md5.h,apr_optional.h,apr_optional_hooks.h,apr_queue.h,apr_reslist.h,apr_rmm.h,apr_sdbm.h,apr_sha1.h,apr_strmatch.h,apr_uri.h,apr_uuid.h,apr_xlate.h,apr_xml.h,apu_compat.h,apu.h,apu_version.h,apu_want.h} \
                $(STAGING_DIR)/usr/lib/*aprutil*
 endef