From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Feb 2010 22:22:43 +0000 (+0100)
Subject: First try of automatic fix of libtool rpath bug.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68477864eba24cd9bf78160f42f2e6e8363a5ab9;p=ipfire-3.x.git

First try of automatic fix of libtool rpath bug.
---

diff --git a/pkgs/Functions b/pkgs/Functions
index 504d101f6..9f8b7b146 100644
--- a/pkgs/Functions
+++ b/pkgs/Functions
@@ -36,6 +36,15 @@ define DO_PYTHON_COMPILE
 	@find $(BUILDROOT) -name "*.py" | xargs $(DIR_TOOLS)/py-compile
 endef
 
+define DO_FIX_LIBTOOL
+	# remove rpath from libtool
+	@if [ -e "libtool" ]; then \
+		sed -i libtool \
+			-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+			-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'; \
+	fi
+endef
+
 define DO_PREPARE
 	@echo "#####################################################################"
 	@echo "# $(PKG_NAME) - Preparation started"
@@ -107,6 +116,7 @@ define STAGE_BUILD
 		./configure \
 			$(CONFIGURE_OPTIONS)
 
+	$(DO_FIX_LIBTOOL)
 	$(STAGE_CONFIGURE_CMDS)
 
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)