diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-27 02:11:11 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-12-27 02:11:11 +0000 |
| commit | 278dde23c7241790efe2b687337d6ec1ebc5ff02 (patch) | |
| tree | 54257bd629866527b78741fcecc6c909481ee020 | |
| parent | 3031854f724c406ca3756a02cad901fad622fdb0 (diff) | |
fix libtool version checks in some configure scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9943 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/autotools.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index fd57e64727..2450318251 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -14,17 +14,25 @@ define replace endef # replace copies of ltmain.sh with the build system's version -update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/) +update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/)$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(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='$(strip $(1))/usr/lib',g" + $(SED) "s,^libdir='/usr/lib',libdir='$(if $(PKG_INSTALL_DIR),$(PKG_INSTALL_DIR),$(STAGING_DIR))/usr/lib',g" +endef + +define remove_version_check + if [ -f "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure" ]; then \ + $(SED) \ + 's,pardus_ltmain_version=.*,pardus_ltmain_version="$$$$pardus_lt_version",' \ + $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \ + fi endef ifneq ($(filter libtool,$(PKG_FIXUP)),) PKG_BUILD_DEPENDS += libtool - Hooks/Configure/Pre += update_libtool + Hooks/Configure/Pre += update_libtool remove_version_check Hooks/Configure/Post += update_libtool - Hooks/Build/Post += libtool_fixup_libdir + Hooks/Compile/Post += libtool_fixup_libdir endif |