[brcm63xx] merger mtu/802.1q related fixes:

[openwrt.git] / package / libtool / Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index c3feb9e..bf9e520 100644 (file)
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 


@@ -14,13 +13,19 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool

-PKG_MD5SUM:=8e0ac9797b62ba4dcc8a2fb7936412b0
+PKG_MD5SUM:=d0071c890101fcf4f2be8934a37841b0

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 
 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

+CONFIGURE_VARS+= CXX=no

 export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
 define Package/libltdl
 export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
 define Package/libltdl


@@ -37,12 +42,10 @@ define Build/InstallDev
                prefix="$(2)" \
                exec_prefix="$(2)" \
                install
                prefix="$(2)" \
                exec_prefix="$(2)" \
                install

-       $(INSTALL_DIR) $(1)/lib
-       mv $(2)/lib/* $(1)/lib/
-#      $(SED) 's,^dlopen_self=unknown,dlopen_self=yes,' \
-#          -e 's,^dlopen_self_static=unknown,dlopen_self_static=no,' \
-#          -e 's,^link_all_deplibs=unknown,link_all_deplibs=no,' \
-#              $(2)/bin/libtool
+       $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+       mv $(2)/lib/* $(1)/usr/lib/
+       mv $(2)/include/* $(1)/usr/include/
+       $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool

 endef
 
 define Package/libltdl/install
 endef
 
 define Package/libltdl/install


@@ -50,4 +53,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))