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

move libiconv out of the way and prevent other autoconf based packages to silently get linked against it

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@4972 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2006-10-08 22:57:03 +00:00
parent c534fa71b7
commit 2c2a210c29
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libs/libiconv/Makefile
View File

@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libiconv PKG_NAME:=libiconv
PKG_VERSION:=1.9.1 PKG_VERSION:=1.9.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
PKG_SOURCE_URL:=@GNU/libiconv
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/libiconv
PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
PKG_CAT:=zcat PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -24,39 +24,42 @@ include $(INCLUDE_DIR)/package.mk
define Package/libiconv define Package/libiconv
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=character set conversion library TITLE:=Character set conversion library
DESCRIPTION:=character set conversion library
URL:=http://www.gnu.org/software/libiconv/ URL:=http://www.gnu.org/software/libiconv/
endef endef
define Build/Configure
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
--disable-rpath \
--with-gnu-ld \
)
endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" CC="$(TARGET_CC)"
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
libdir="$(PKG_INSTALL_DIR)/usr/lib" \
includedir="$(PKG_INSTALL_DIR)/usr/include" \ includedir="$(PKG_INSTALL_DIR)/usr/include" \
install-lib libdir="$(PKG_INSTALL_DIR)/usr/lib" \
all install-lib
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/
mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/
endef
define Build/UninstallDev
rm -rf $(STAGING_DIR)/usr/lib/libiconv
endef endef
define Package/libiconv/install define Package/libiconv/install
install -d -m0755 $(1)/usr/lib install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/
chmod 0644 $(1)/usr/lib/*
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/
endef
define Build/UninstallDev
rm -rf \
$(STAGING_DIR)/usr/include/iconv.h \
$(STAGING_DIR)/usr/lib/libiconv.*
endef endef
$(eval $(call BuildPackage,libiconv)) $(eval $(call BuildPackage,libiconv))

4
net/ettercap/Makefile
View File

@ -44,10 +44,12 @@ define Build/Configure
--with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \ --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \
--with-openssl="$(STAGING_DIR)/usr" \ --with-openssl="$(STAGING_DIR)/usr" \
--with-libpcre="$(STAGING_DIR)/usr" \ --with-libpcre="$(STAGING_DIR)/usr" \
--with-libiconv="$(STAGING_DIR)/usr" \ --with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \
--with-libncurses="$(STAGING_DIR)/usr" \ --with-libncurses="$(STAGING_DIR)/usr" \
--disable-gtk \ --disable-gtk \
--disable-debug \ --disable-debug \
, \
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
) )
endef endef