From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 18 Feb 2010 23:50:44 +0000 (+0000)
Subject: autotools.mk: Add PKG_LIBTOOL_PATHS variable.
X-Git-Tag: reboot~21008
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d38ce9313b0cbe3f48edec87ee23e9f5be523a06;p=openwrt%2Fstaging%2Flynxis.git

autotools.mk: Add PKG_LIBTOOL_PATHS variable.

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
---

diff --git a/include/autotools.mk b/include/autotools.mk
index cd333577c1..f85026a944 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -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.
 # See /LICENSE for more information.
@@ -13,10 +13,24 @@ define replace
 	
 endef
 
+PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
+
 # 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=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call update_libtool_common)
-update_libtool_ucxx=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/,libtool-ucxx)$(call update_libtool_common)
+update_libtool_common = \
+	$(foreach p,$(LIBTOOL_PATHS), \
+		$(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
@@ -32,7 +46,7 @@ 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",' \
+			's,\(gentoo\|pardus\)_ltmain_version=.*,\1_ltmain_version="$$$$\1_lt_version",' \
 			$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \
 	fi
 endef