RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix libtool version checks in some configure scripts 

SVN-Revision: 9943
This commit is contained in:
Felix Fietkau 2007-12-27 02:11:11 +00:00
parent 5c2991d8bc
commit 585a9ff548
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/autotools.mk
View File

@ -14,17 +14,25 @@ define replace
endef endef
# replace copies of ltmain.sh with the build system's version # 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 # prevent libtool from linking against host development libraries
define libtool_fixup_libdir define libtool_fixup_libdir
find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \ 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 endef
ifneq ($(filter libtool,$(PKG_FIXUP)),) ifneq ($(filter libtool,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool PKG_BUILD_DEPENDS += libtool
Hooks/Configure/Pre += update_libtool Hooks/Configure/Pre += update_libtool remove_version_check
Hooks/Configure/Post += update_libtool Hooks/Configure/Post += update_libtool
Hooks/Build/Post += libtool_fixup_libdir Hooks/Compile/Post += libtool_fixup_libdir
endif endif