X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Flibtool%2FMakefile;h=5aa5aa3652dfb3f13f4c15dba8886c59b436a7a6;hp=324025a295b607b0cd3d8dad8a0652c5b90c0c90;hb=e72a3e7a78aad6bcb20ba3b9a513d7eb2159b793;hpb=ef016940caaa87addafb3b0a2d04b13e7bf1ecf5

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 324025a295..5aa5aa3652 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -8,15 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
-PKG_VERSION:=1.5.24
+PKG_VERSION:=2.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
-PKG_MD5SUM:=d0071c890101fcf4f2be8934a37841b0
+PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+HOST_PATCH_DIR=/dev/null
 
+PKG_BUILD_DEPENDS:=libtool/host
+
+PKG_BUILD_PARALLEL:=0
+HOST_BUILD_PARALLEL:=0
+
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
@@ -39,9 +45,9 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
 	mv $(2)/lib/* $(1)/usr/lib/
 	mv $(2)/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal
-	$(CP) $(2)/share/aclocal/* $(STAGING_DIR_HOST)/share/aclocal/
 	$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool
+	$(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx
+	$(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx
 endef
 
 define Package/libltdl/install
@@ -49,4 +55,5 @@ define Package/libltdl/install
 	$(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libltdl))