X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/95761f2647f36776f4f0c72d8f55c983c69c3eab..c5c13741660e71b17e1f8f3be2bffeb49e5dc429:/include/autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index 5d51d7a32..c941a4949 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,24 +13,38 @@ 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)
 
+autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
 
 # prevent libtool from linking against host development libraries
 define libtool_fixup_libdir
 	find $(1) -name '*.la' | $(XARGS) \
-		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g"
-	find $(2) -name '*.la' | $(XARGS) \
-		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g"
+		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
+		    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,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",' \
+			's,\(gentoo\|pardus\)_ltmain_version=.*,\1_ltmain_version="$$$$\1_lt_version",' \
 			$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \
 	fi
 endef