[patch] libtool.eclass Prefix patch

libtool-prefix.patch (text/plain), 3.77 KB, created by Fabian Groffen on 2010-01-16 13:42:14 UTC

--- libtool.eclass
+++ libtool.eclass
@@ -122,6 +122,7 @@
 	local do_reversedeps="no"
 	local do_only_patches="no"
 	local do_uclibc="yes"
+	local do_force="no"
 	local deptoremove=
 	local my_dirlist=
 	local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
@@ -165,6 +166,9 @@
 			"--no-uclibc")
 				do_uclibc="no"
 				;;
+			"--force")
+				do_force="yes"
+				;;
 			*)
 				eerror "Invalid elibtoolize option: ${x}"
 				die "elibtoolize called with ${x} ??"
@@ -177,15 +181,45 @@
 	[[ ${CHOST} == *"-freebsd"* ]] && \
 		elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
 
+	# Hardcoding library path does not work with DESTDIR installs.
+	#
+	# Affects any platform with 'hardcode_direct=yes' or 'hardcode_minus_L=yes'.
+	# According to libtool.m4 (as of libtool-1.5.26), these are:
+	#    *-aix*
+	#    *-hpux9
+	#    hppa-hpux* (not hppa64 or ia64)
+	#    *-netbsd
+	#    *-openbsd
+	#    *-freebsd
+	#    *-dragonfly
+	#    *-newsos6
+	#    *-os2
+	#    *-amigaos
+	#    *-sunos4
+	#    *-sysv4
+	# It definitely is required for aix (to support DESTDIR),
+	# although it should help for others too...
+	[[ ${CHOST} == *"-aix"* ]] &&
+		elt_patches="${elt_patches} hardcode aixrtl"
+
 	[[ ${CHOST} == *"-darwin"* ]] && \
-		elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
+		elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf"
+
+	[[ ${CHOST} == *"-mint"* ]] && \
+		elt_patches="${elt_patches} mint-conf"
+
+	# Need help from binutils-config (>=toolchain-prefix-wrapper-0.3.1655)
+	# to create correct shared libraries and executables on hppa-hpux via
+	# libtool in combination with DESTDIR to avoid $D getting encoded.
+	[[ ${CHOST} == *"-hpux"* ]] && \
+		elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc"
 
 	for x in ${my_dirlist} ; do
 		local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
 		export ELT_APPLIED_PATCHES=
 		export ELT_LTMAIN_SH="${x}/ltmain.sh"
 
-		[[ -f ${x}/.elibtoolized ]] && continue
+		[[ ${do_force} == no && -f ${x}/.elibtoolized ]] && continue
 
 		cd ${x}
 		einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
@@ -260,6 +294,18 @@
 						ret=$?
 					fi
 					;;
+				"darwin-conf")
+					if [[ -e ${x}/configure && \
+					      -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then
+						ELT_walk_patches "${x}/configure" "${y}"
+						ret=$?
+					# ltmain.sh and co might be in a subdirectory ...
+					elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
+					        -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then
+						ELT_walk_patches "${x}/../configure" "${y}"
+						ret=$?
+					fi
+					;;
 				"darwin-ltconf")
 					# Newer libtoolize clears ltconfig, as not used anymore
 					if [[ -s ${x}/ltconfig ]] ; then
@@ -267,6 +313,32 @@
 						ret=$?
 					fi
 					;;
+				"darwin-ltmain")
+					# special case to avoid false positives (failing to apply
+					# ltmain.sh path message), newer libtools have this patch
+					# built in, so not much to patch around then
+					if [[ -e ${x}/ltmain.sh && \
+					      -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then
+						ELT_walk_patches "${x}/ltmain.sh" "${y}"
+						ret=$?
+					fi
+					;;
+				"aixrtl" | "hpux-conf" | "mint-conf" )
+					ret=1
+					local subret=1
+					if [[ -e ${x}/configure ]]; then
+						ELT_walk_patches "${x}/configure" "${y}"
+						subret=$?
+					# ltmain.sh and co might be in a subdirectory ...
+					elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
+						ELT_walk_patches "${x}/../configure" "${y}"
+						subret=$?
+					fi
+					if [[ $subret -eq 0 ]]; then
+						# have at least one patch succeeded.
+						ret=0
+					fi
+					;;
 				"install-sh")
 					ELT_walk_patches "${x}/install-sh" "${y}"
 					ret=$?