move libiconv out of the way and prevent other autoconf based packages to silently...

SVN-Revision: 4972

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index a00646e9460229f382363d2367367580fadb4ca1..ef4a10ab55a6ce4a8892f3a5d618e7a9b44cbb74 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libiconv
 PKG_VERSION:=1.9.1
 PKG_RELEASE:=1
 PKG_NAME:=libiconv
 PKG_VERSION:=1.9.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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)


@@ -24,39 +24,42 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libiconv
   SECTION:=libs
   CATEGORY:=Libraries
 define Package/libiconv
   SECTION:=libs
   CATEGORY:=Libraries

-  TITLE:=character set conversion library
-  DESCRIPTION:=character set conversion library
+  TITLE:=Character set conversion library

   URL:=http://www.gnu.org/software/libiconv/
 endef
 
   URL:=http://www.gnu.org/software/libiconv/
 endef
 

+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+               --disable-rpath \
+               --with-gnu-ld \
+       )
+endef
+

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)"
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                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
-endef
-
-define Package/libiconv/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/
-       chmod 0644 $(1)/usr/lib/*
+               libdir="$(PKG_INSTALL_DIR)/usr/lib" \
+               all install-lib

 endef
 
 define Build/InstallDev
 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/
+       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      
 endef
 
 define Build/UninstallDev      

-       rm -rf \
-               $(STAGING_DIR)/usr/include/iconv.h \
-               $(STAGING_DIR)/usr/lib/libiconv.*
+       rm -rf  $(STAGING_DIR)/usr/lib/libiconv
+endef
+
+define Package/libiconv/install
+       install -d -m0755 $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,libiconv))
 endef
 
 $(eval $(call BuildPackage,libiconv))

diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index ea4c28e84d99b1297a4ef027e73f0fa8f7e84c83..920054922090826c423bd7c9f9fcd07269253e97 100644 (file)
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -44,10 +44,12 @@ define Build/Configure
                --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \
                --with-openssl="$(STAGING_DIR)/usr" \
                --with-libpcre="$(STAGING_DIR)/usr" \
                --with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \
                --with-openssl="$(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" \
                --disable-gtk \
                --disable-debug \
                --with-libncurses="$(STAGING_DIR)/usr" \
                --disable-gtk \
                --disable-debug \

+               , \
+               LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \

        )
 endef
 
        )
 endef