summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-09-13 00:29:13 +0000
committerlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-09-13 00:29:13 +0000
commit55726e9322e529748a360b99a3a6d3ede779c269 (patch)
treefe55c51f8951b52bbe05145c4d94ff21bfd4d1e3
parent32e00e020b55514f46200b31d54e1053f626a2f5 (diff)
Change libtool fixup behaviour. Still ugly but it works until we have a real
fix. It uses a InstallDev/Post hook to find all .la files which are going to be installed in the staging dir and prefixes every path in those files which starts with /usr/lib with $(STAGING_DIR). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12586 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/autotools.mk13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index 245031825..17fa179fa 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -1,9 +1,10 @@
-#
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+# $Id$
define replace
if [ -f "$(PKG_BUILD_DIR)/$(3)$(1)" -a -e "$(2)/$(1)" ]; then \
@@ -18,8 +19,10 @@ update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/
# prevent libtool from linking against host development libraries
define libtool_fixup_libdir
- find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \
- $(SED) "s,^libdir='/usr/lib',libdir='$(if $(PKG_INSTALL_DIR),$(PKG_INSTALL_DIR),$(STAGING_DIR))/usr/lib',g"
+ find $(1) -name '*.la' | $(XARGS) \
+ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g"
+ find $(2) -name '*.la' | $(XARGS) \
+ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g"
endef
define remove_version_check
@@ -34,5 +37,5 @@ ifneq ($(filter libtool,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool
Hooks/Configure/Pre += update_libtool remove_version_check
Hooks/Configure/Post += update_libtool
- Hooks/Compile/Post += libtool_fixup_libdir
+ Hooks/InstallDev/Post += libtool_fixup_libdir
endif