[patch] add get_binary_libdir function and uses instead of get_libdir in the two required places

get_binary_libdir.patch (text/plain), 1.02 KB, created by Jack Hill on 2012-08-07 13:16:12 UTC

The ghc binary used for bootstrapping may have a different
idea of what its libdir is compared to the profile.

--- ghc-7.4.1-binary-libdir
+++ ghc-7.4.1-binary-libdir
@@ -196,6 +196,11 @@
 	esac
 }
 
+get_binary_libdir() {
+  "${WORKDIR}/usr/bin/ghc-${PV}" --print-libdir 
+
+}
+
 # substitutes string $1 to $2 in files $3 $4 ...
 relocate_path() {
 	local from=$1
@@ -224,7 +229,7 @@
 		"${WORKDIR}/usr/bin/ghci-${PV}" \
 		"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
 		"${WORKDIR}/usr/bin/hsc2hs" \
-		"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf.d/"*
+		"${WORKDIR}/usr/$(get_binary_libdir)/${P}/package.conf.d/"*
 
 	# this one we will use to regenerate cache
 	# so it shoult point to current tree location
@@ -291,7 +296,7 @@
 		# allow hardened users use vanilla binary to bootstrap ghc
 		# ghci uses mmap with rwx protection at it implements dynamic
 		# linking on it's own (bug #299709)
-		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${P}/ghc"
+		pax-mark -m "${WORKDIR}/usr/$(get_binary_libdir)/${P}/ghc"
 	fi
 
 	if use binary; then