diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2008-09-13 00:29:13 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2008-09-13 00:29:13 +0000 |
| commit | 6f774d468ffbfb98da4051ec7610c7025584b798 (patch) | |
| tree | 60a2623b4f5b11aec9b1c06a31a2979f13e3da11 | |
| parent | 91d3e6b05b2f3c6e2a0acc677c7c6a5d156a483b (diff) | |
| download | upstream-6f774d468ffbfb98da4051ec7610c7025584b798.tar.gz upstream-6f774d468ffbfb98da4051ec7610c7025584b798.tar.bz2 upstream-6f774d468ffbfb98da4051ec7610c7025584b798.zip | |
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).
SVN-Revision: 12586
| -rw-r--r-- | include/autotools.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index 2450318251..17fa179fa1 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 |