[patch] use correct pathc for binary libdir

get_binary_libdir.patch (text/plain), 1.23 KB, created by Jack Hill on 2012-08-07 17:53:00 UTC

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

--- ghc-4.7.1-binary-libdir
+++ ghc-4.7.1-binary-libdir
@@ -196,6 +196,21 @@
 	esac
 }
 
+# workaround for bug #411595
+get_binary_libdir() {
+  if [[ -d "${WORKDIR}/usr/lib" ]] ; then
+    echo lib
+  elif [[ -d "${WORKDIR}/usr/lib64" ]] ; then
+    echo lib64
+  elif [[ -d "${WORKDIR}/usr/lib32" ]] ; then
+    echo lib32
+  else
+    die "could not determine binary libdir"
+  fi
+
+
+}
+
 # substitutes string $1 to $2 in files $3 $4 ...
 relocate_path() {
 	local from=$1
@@ -224,7 +239,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 +306,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_libdir)/${P}/ghc"
 	fi
 
 	if use binary; then