summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2020-03-09 15:49:21 +0100
committerSam James <sam@gentoo.org>2023-05-26 07:09:09 +0100
commit33a350e708b3955aef36e02d8cb717a570202c72 (patch)
tree5a7736be257982e49b8c64eb238afd9795c7fcb9
parentapp-portage/prefix-toolkit(winnt): pull pthreads4w, intercept -pthread (diff)
downloadprefix-toolkit-7.tar.gz
prefix-toolkit-7.tar.bz2
prefix-toolkit-7.zip
app-portage/prefix-toolkit: stack: set AT_SYS_M4DIR, run gcc-configprefix-toolkit-7
In stacked Prefix, need to set AT_SYS_M4DIR so eautoreconf is able to find the m4 files from stacked Prefix. As prefix-toolkit does wrap the compiler found in base prefix to get the additional system paths in, need to perform gcc-config at pkg_postinst. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Haubenwallner <haubi@gentoo.org> (cherry picked from commit 3f6fc129ad56558e154c0542686160c786bdc0a3)
-rw-r--r--prefix-stack.envd.99stack1
-rw-r--r--prefix-toolkit-7.ebuild (renamed from prefix-toolkit-6.ebuild)7
2 files changed, 8 insertions, 0 deletions
diff --git a/prefix-stack.envd.99stack b/prefix-stack.envd.99stack
index accb12f..1753afc 100644
--- a/prefix-stack.envd.99stack
+++ b/prefix-stack.envd.99stack
@@ -1,3 +1,4 @@
PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+AT_SYS_M4DIR@=@"@GENTOO_PORTAGE_EPREFIX@/usr/share/aclocal"
PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
diff --git a/prefix-toolkit-6.ebuild b/prefix-toolkit-7.ebuild
index a052312..f401ec7 100644
--- a/prefix-toolkit-6.ebuild
+++ b/prefix-toolkit-7.ebuild
@@ -178,6 +178,12 @@ pkg_preinst() {
eend $?
}
+pkg_postinst() {
+ use prefix-stack || return 0
+ [[ -x ${EROOT}/usr/bin/gcc-config ]] || return 0
+ "${EROOT}"/usr/bin/gcc-config ${CHOST}-${P}
+}
+
return 0
: startprefix <<'EOIN'
@@ -319,6 +325,7 @@ EOIN
: prefix-stack.envd.99stack <<'EOIN'
PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+AT_SYS_M4DIR@=@"@GENTOO_PORTAGE_EPREFIX@/usr/share/aclocal"
PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
EOIN