KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

autotools.mk: Add PKG_LIBTOOL_PATHS variable.

Browse source 
PKG_LIBTOOL_PATHS can be used to specify to tell libtool_fixup where to look
for libtool scripts of a package. This is useful if a package has it's libtool
script in a non-standard location or has multiple libtool scripts.

The value should be a space seperated list of paths which are relative to
$(PKG_BUILD_DIR). It defautls to $(CONFIGURE_PATH).

SVN-Revision: 19713
This commit is contained in:
Lars-Peter Clausen 2010-02-18 23:50:44 +00:00
parent 8d7a6df6ef
commit d38ce9313b
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/autotools.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007-2009 OpenWrt.org # Copyright (C) 2007-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -13,10 +13,24 @@ define replace
endef endef
PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
# replace copies of ltmain.sh with the build system's version # replace copies of ltmain.sh with the build system's version
update_libtool_common=$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/)$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(CONFIGURE_PATH)/) update_libtool_common = \
update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call update_libtool_common) $(foreach p,$(LIBTOOL_PATHS), \
update_libtool_ucxx=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/,libtool-ucxx)$(call update_libtool_common) $(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(p)/) \
$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(p)/) \
)
update_libtool = \
$(foreach p,$(PKG_LIBTOOL_PATHS), \
$(call replace,libtool,$(STAGING_DIR)/host/bin,$(p)/) \
) \
$(call update_libtool_common)
update_libtool_ucxx = \
$(foreach p,$(PKG_LIBTOOL_PATHS), \
$(call replace,libtool,$(STAGING_DIR)/host/bin,$(p)/,libtool-ucxx) \
) \
$(call update_libtool_common)
# prevent libtool from linking against host development libraries # prevent libtool from linking against host development libraries
@ -32,7 +46,7 @@ endef
define remove_version_check define remove_version_check
if [ -f "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure" ]; then \ if [ -f "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure" ]; then \
$(SED) \ $(SED) \
's,pardus_ltmain_version=.*,pardus_ltmain_version="$$$$pardus_lt_version",' \ 's,\(gentoo\|pardus\)_ltmain_version=.*,\1_ltmain_version="$$$$\1_lt_version",' \
$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \ $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \
fi fi
endef endef