[patch] Patch to relocate prebuilt binaries by overriding interpreter path (ghc ebuild patch)

0002-dev-lang-ghc-relocate-prebuilt-binaries-in-prefix.patch (text/plain), 11.63 KB, created by Alexei Colin on 2021-02-03 19:57:50 UTC

From fdc26eaa3c37801f35a040ef4856fa752bc37397 Mon Sep 17 00:00:00 2001
From: Alexei Colin <[e-mail]>
Date: Wed, 3 Feb 2021 14:42:26 -0500
Subject: [PATCH 2/2] dev-lang/ghc: relocate prebuilt binaries in prefix

This patch fixes the build in prefix on ppc64le.  Without this patch,
the build fails because the GHC bootstrap binaries are not fully
relocated and attempt to use the host's dynamic loader, so the build
fails with:

    /prefix/var/tmp/portage/dev-lang/ghc-8.8.1/work/usr/lib64/ghc-8.8.1/bin/ghc-pkg:
    /lib64/libm.so.6: version `GLIBC_2.29' not found (required
by
    /prefix/var/tmp/portage/dev-lang/ghc-8.8.1/work/usr/lib64/ghc-8.8.1/bin/../base-4.13.0.0
/libHSbase-4.13.0.0-ghc8.8.1.so)

Signed-off-by: Alexei Colin <[e-mail]>
---
 dev-lang/ghc/ghc-7.10.3.ebuild | 2 ++
 dev-lang/ghc/ghc-8.0.2.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.10.1.ebuild | 2 ++
 dev-lang/ghc/ghc-8.10.2.ebuild | 2 ++
 dev-lang/ghc/ghc-8.10.3.ebuild | 2 ++
 dev-lang/ghc/ghc-8.2.1.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.2.2.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.4.1.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.4.2.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.4.3.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.6.4.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.6.5.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.8.1.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.8.2.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.8.3.ebuild  | 2 ++
 dev-lang/ghc/ghc-8.8.4.ebuild  | 2 ++
 16 files changed, 32 insertions(+)

diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
index 590b6e0..8a70b28 100644
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@@ -90,6 +90,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -325,6 +326,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index ede481d..f558b7c 100644
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild
@@ -88,6 +88,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -320,6 +321,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.10.1.ebuild b/dev-lang/ghc/ghc-8.10.1.ebuild
index 1db40de..6deca43 100644
--- a/dev-lang/ghc/ghc-8.10.1.ebuild
+++ b/dev-lang/ghc/ghc-8.10.1.ebuild
@@ -95,6 +95,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -335,6 +336,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.10.2.ebuild b/dev-lang/ghc/ghc-8.10.2.ebuild
index fc81980..c09808a 100644
--- a/dev-lang/ghc/ghc-8.10.2.ebuild
+++ b/dev-lang/ghc/ghc-8.10.2.ebuild
@@ -95,6 +95,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -335,6 +336,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.10.3.ebuild b/dev-lang/ghc/ghc-8.10.3.ebuild
index 4b91c85..60dfd71 100644
--- a/dev-lang/ghc/ghc-8.10.3.ebuild
+++ b/dev-lang/ghc/ghc-8.10.3.ebuild
@@ -95,6 +95,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -335,6 +336,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild
index aa2a45c..4c30086 100644
--- a/dev-lang/ghc/ghc-8.2.1.ebuild
+++ b/dev-lang/ghc/ghc-8.2.1.ebuild
@@ -84,6 +84,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -325,6 +326,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.2.2.ebuild b/dev-lang/ghc/ghc-8.2.2.ebuild
index 1338261..1fb4c25 100644
--- a/dev-lang/ghc/ghc-8.2.2.ebuild
+++ b/dev-lang/ghc/ghc-8.2.2.ebuild
@@ -84,6 +84,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -325,6 +326,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.4.1.ebuild b/dev-lang/ghc/ghc-8.4.1.ebuild
index 0e86ec3..2bb0fb6 100644
--- a/dev-lang/ghc/ghc-8.4.1.ebuild
+++ b/dev-lang/ghc/ghc-8.4.1.ebuild
@@ -84,6 +84,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -325,6 +326,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild
index f6d8c95..7fd78d8 100644
--- a/dev-lang/ghc/ghc-8.4.2.ebuild
+++ b/dev-lang/ghc/ghc-8.4.2.ebuild
@@ -84,6 +84,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -328,6 +329,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.4.3.ebuild b/dev-lang/ghc/ghc-8.4.3.ebuild
index 58e6423..58ca894 100644
--- a/dev-lang/ghc/ghc-8.4.3.ebuild
+++ b/dev-lang/ghc/ghc-8.4.3.ebuild
@@ -84,6 +84,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -328,6 +329,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.6.4.ebuild b/dev-lang/ghc/ghc-8.6.4.ebuild
index 52d995e..4839b7e 100644
--- a/dev-lang/ghc/ghc-8.6.4.ebuild
+++ b/dev-lang/ghc/ghc-8.6.4.ebuild
@@ -90,6 +90,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -334,6 +335,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild
index 89e16a5..cffdaa9 100644
--- a/dev-lang/ghc/ghc-8.6.5.ebuild
+++ b/dev-lang/ghc/ghc-8.6.5.ebuild
@@ -95,6 +95,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -339,6 +340,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.8.1.ebuild b/dev-lang/ghc/ghc-8.8.1.ebuild
index 00ce568..87b63d2 100644
--- a/dev-lang/ghc/ghc-8.8.1.ebuild
+++ b/dev-lang/ghc/ghc-8.8.1.ebuild
@@ -94,6 +94,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -340,6 +341,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.8.2.ebuild b/dev-lang/ghc/ghc-8.8.2.ebuild
index 61b81fb..0853834 100644
--- a/dev-lang/ghc/ghc-8.8.2.ebuild
+++ b/dev-lang/ghc/ghc-8.8.2.ebuild
@@ -94,6 +94,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -340,6 +341,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.8.3.ebuild b/dev-lang/ghc/ghc-8.8.3.ebuild
index eb0ede0..25e8b10 100644
--- a/dev-lang/ghc/ghc-8.8.3.ebuild
+++ b/dev-lang/ghc/ghc-8.8.3.ebuild
@@ -94,6 +94,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -344,6 +345,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
diff --git a/dev-lang/ghc/ghc-8.8.4.ebuild b/dev-lang/ghc/ghc-8.8.4.ebuild
index 0ad8813..e73a8fd 100644
--- a/dev-lang/ghc/ghc-8.8.4.ebuild
+++ b/dev-lang/ghc/ghc-8.8.4.ebuild
@@ -94,6 +94,7 @@ RDEPEND="
 #    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
 	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+	prefix? ( dev-util/patchelf )
 "
 # This set of dependencies is needed to install
 # ghc[binary] in system. terminfo package is linked
@@ -344,6 +345,7 @@ relocate_ghc() {
 
 	if use prefix; then
 		hprefixify "${bin_libpath}"/${PN}*/settings
+		exprefixify "${WORKDIR}"
 	fi
 
 	# regenerate the binary package cache
-- 
1.8.3.1