Fix a memory leak in hotplug2 environment handling.

[openwrt.git] / package / libtool / Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 324025a..e5d1172 100644 (file)
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -8,15 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool

-PKG_VERSION:=1.5.24
+PKG_VERSION:=1.5.26

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool

-PKG_MD5SUM:=d0071c890101fcf4f2be8934a37841b0
+PKG_MD5SUM:=aa9c5107f3ec9ef4200eb6556f3b3c29

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+HOST_PATCH_DIR=/dev/null

 
 

+PKG_BUILD_DEPENDS:=libtool/host
+
+include $(INCLUDE_DIR)/host-build.mk

 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host


@@ -39,9 +42,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) $(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
        $(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
 endef
 
 define Package/libltdl/install


@@ -49,4 +52,5 @@ define Package/libltdl/install
        $(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
 endef
 
        $(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
 endef
 

+$(eval $(call HostBuild))

 $(eval $(call BuildPackage,libltdl))
 $(eval $(call BuildPackage,libltdl))