add a workaround preventing libtool from hardcoding library path in shared libs

[openwrt.git] / package / libtool / Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 1aad641..324025a 100644 (file)
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,23 +4,23 @@
 # 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
 
 PKG_NAME:=libtool
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool

-PKG_VERSION:=1.5.22
+PKG_VERSION:=1.5.24

 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:=8e0ac9797b62ba4dcc8a2fb7936412b0
+PKG_MD5SUM:=d0071c890101fcf4f2be8934a37841b0

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_PREFIX=$(STAGING_DIR)/host

+export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib

 
 define Package/libltdl
   SECTION:=libs
 
 define Package/libltdl
   SECTION:=libs


@@ -31,11 +31,17 @@ endef
 
 define Build/InstallDev
        $(MAKE) -C $(PKG_BUILD_DIR) \
 
 define Build/InstallDev
        $(MAKE) -C $(PKG_BUILD_DIR) \

+               bindir="$(2)/bin" \
+               datadir="$(2)/share" \

                prefix="$(2)" \
                exec_prefix="$(2)" \
                install
                prefix="$(2)" \
                exec_prefix="$(2)" \
                install

-       $(INSTALL_DIR) $(1)/lib
-       mv $(2)/lib/* $(1)/lib/
+       $(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

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