X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1a29ac6fa7c4075604072a2504f5428228b645f8..ff1c6f7ebb3bf00d1ff402ab35cdf7e656055b38:/package/libtool/Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index d03920f0d..5aa5aa365 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,20 +4,25 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 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
@@ -40,8 +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
-	mv $(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))