X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3031854f724c406ca3756a02cad901fad622fdb0..f2f4eb83ff856cef795dee0e4ae8382de97181a5:/include/autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index fd57e6472..c941a4949 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -1,30 +1,65 @@
-# 
-# Copyright (C) 2007 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.
 #
 
 define replace
-	if [ -f "$(PKG_BUILD_DIR)/$(3)$(1)" -a -e "$(2)/$(1)" ]; then \
+	if [ -f "$(PKG_BUILD_DIR)/$(3)$(1)" -a -e "$(2)/$(if $(4),$(4),$(1))" ]; then \
 		rm -f $(PKG_BUILD_DIR)/$(3)$(1); \
-		ln -s $(2)/$(1) $(PKG_BUILD_DIR)/$(3); \
+		ln -s $(2)/$(if $(4),$(4),$(1)) $(PKG_BUILD_DIR)/$(3)$(1); \
 	fi
 	
 endef
 
+PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
+
 # 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_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 $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \
-		$(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
+	find $(1) -name '*.la' | $(XARGS) \
+		$(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,\(gentoo\|pardus\)_ltmain_version=.*,\1_ltmain_version="$$$$\1_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/InstallDev/Post += libtool_fixup_libdir
 endif
+
+ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
+  PKG_BUILD_DEPENDS += libtool
+  Hooks/Configure/Pre += update_libtool_ucxx remove_version_check
+  Hooks/Configure/Post += update_libtool_ucxx
+  Hooks/InstallDev/Post += libtool_fixup_libdir
+endif
+