bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove iconv dependancy when not absolutely required

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@7512 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2007-06-06 23:49:06 +00:00
parent 00b407cc4f
commit 1b529d52be
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/libiconv/Makefile
View File

@ -49,7 +49,6 @@ endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/lib/libiconv/include 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/lib/libiconv/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/
endef endef

4
net/weechat/Makefile
View File

@ -37,7 +37,7 @@ define Build/Configure
--with-debug=0 \ --with-debug=0 \
--with-libgnutls-prefix=$(STAGING_DIR)/usr \ --with-libgnutls-prefix=$(STAGING_DIR)/usr \
--without-doc-xsl-prefix \ --without-doc-xsl-prefix \
--without-libiconv-prefix \ --with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
--without-libintl-prefix \ --without-libintl-prefix \
--disable-aspell \ --disable-aspell \
--enable-lua \ --enable-lua \
@ -47,7 +47,7 @@ define Build/Configure
--disable-python \ --disable-python \
--disable-ruby \ --disable-ruby \
, \ , \
LIBS="-llua -ldl -lm" \ LIBS="-llua -ldl -lm -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
) )
endef endef

1
sound/mpc/Makefile
View File

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

4
utils/apr-util/Makefile
View File

@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/apr-util define Package/apr-util
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libiconv +libexpat +apr DEPENDS:=+libexpat +apr
TITLE:=Apache Portable Runtime Library Util TITLE:=Apache Portable Runtime Library Util
URL:=http://apr.apache.org/ URL:=http://apr.apache.org/
endef endef
@ -60,7 +60,7 @@ define Build/InstallDev
endef endef
define Build/UninstallDev 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/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* $(STAGING_DIR)/usr/lib/*aprutil*
endef endef