mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 23:46:16 +02:00
fix libtool version checks in some configure scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9943 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
3031854f72
commit
278dde23c7
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user