[package] update neon to 0.29.0 (#5938)

[openwrt/svn-archive/archive.git] / libs / libiconv / Makefile

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index ef4a10ab55a6ce4a8892f3a5d618e7a9b44cbb74..238cdb6430fad778824e8d2b7330baf1e14beb97 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -1,65 +1,84 @@
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiconv
-PKG_VERSION:=1.9.1
+PKG_VERSION:=1.11
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
-PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
-PKG_CAT:=zcat
+PKG_MD5SUM:=b77a17e4a5a817100ad4b2613935055e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/libiconv/Default
+  URL:=http://www.gnu.org/software/libiconv/
+  TITLE:=Character set conversion
+endef
+
 define Package/libiconv
+  $(call Package/libiconv/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Character set conversion library
-  URL:=http://www.gnu.org/software/libiconv/
+  TITLE+= library
+endef
+
+define Package/libcharset
+  $(call Package/libiconv/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --disable-rpath \
-               --with-gnu-ld \
-       )
+define Package/iconv
+  $(call Package/libiconv/Default)
+  DEPENDS:=+libiconv +libcharset
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= utility
 endef
 
+TARGET_CFLAGS += $(FPIC) -DUSE_DOS
+
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --disable-rpath \
+       --enable-relocatable
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)"
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               includedir="$(PKG_INSTALL_DIR)/usr/include" \
-               libdir="$(PKG_INSTALL_DIR)/usr/lib" \
-               all install-lib
+               CC="$(TARGET_CC)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               install
 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/
+       mkdir -p $(1)/usr/lib/libiconv/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/lib/libiconv/include/
+       mkdir -p $(1)/usr/lib/libiconv/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.{a,so*} $(1)/usr/lib/libiconv/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/libiconv/lib/
 endef
 
-define Build/UninstallDev      
-       rm -rf  $(STAGING_DIR)/usr/lib/libiconv
+define Package/libcharset/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.so* $(1)/usr/lib/
 endef
 
 define Package/libiconv/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/
 endef
 
+$(eval $(call BuildPackage,libcharset))
 $(eval $(call BuildPackage,libiconv))
+$(eval $(call BuildPackage,iconv))