Make pconfigure respect multilib paths

Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>

3 files changed, 89 insertions, 1 deletions

diff --git a/sys-devel/pconfigure/Manifest b/sys-devel/pconfigure/Manifest
index f017a02..4577476 100644
--- a/sys-devel/pconfigure/Manifest
+++ b/sys-devel/pconfigure/Manifest
@@ -1,5 +1,6 @@
 AUX pconfigure-0.10.4-bootstrap.patch 803 BLAKE2B 6ba21ce54b2dfecc802435b5ca2e6c5068eb214ccae6c8bb7107714fc0555c3940f6ec7688ae7f42870bd862841e4db162ff6eaca01e147f9d61c073334ce13a SHA512 42517f68008a94afe8abc0e8a0ed1d3c37abde6e9ffccba9c293340e747c8a70ed1551486ad71eb271f8ccf699371de3929d196b44d7ada8cd0db084e917ac8b
 AUX pconfigure-0.11.0-destdir.patch 2061 BLAKE2B f8a4b5178ee74671c96ab23274b8a951e16c007e6d869cf925c925deb933a9fbdf45ddd4d8ea69886ac316b872f3c514ecbb31917a85a7fa9d6860827ff92837 SHA512 362e675daf92478e528832e840e589ab52ae28d4295c8550bc8801c826849533b4b1f7077b0eb8aa0c3e76e9b5a996609fa70705b42c8ac1f54cfa9afd141b21
+AUX pconfigure-0.12.5-libdir.patch 1229 BLAKE2B 9bbc26ae22f8792bdc254b389b8c0bd48f5f21e44be29735e9f3081cdf698cf5e8b5f0406e7109588154bab7a4829fda85c9371d9db466323733a017316f6a33 SHA512 33728c1badbe87b55669f29857f2c16eca820dae7ccdb3d2344110ed9092705c84a739c0a5e760faaf8c2c7d1666abcb01fd21c79d2d7007cc94ce88a3b27f54
 AUX pconfigure-0.9.4-glibc_2.20.patch 1044 BLAKE2B eadb84f5419914856d7f428e46ab84ef7e2703dc16d1fb2d1986dfd280305fa6f5b999d235776f7a34e58d2a33f6203f77ed835fce2af45d3162190a3812dc08 SHA512 5530d1636280cba4b5aaa808628fa03d963e2416f9c518b6408459a4b7256c2c91f4c5f88d7e0df9793f0722ca80250bf0a94b7479de476dcb5de6358503f9a2
 DIST pconfigure-0.10.4.tar.gz 177891 BLAKE2B e0c94916a3850b5599eb4b580ef22ee83feee002516fd650bc625afec8a6e3e248311bf3a0147330ec326656e384d5f472c4009856f8b80a612a7cd1882787e3 SHA512 0703a186d34660bb83d3472ec8fc75d3457702a4a92cfe6797982960d7f9d7f62d83eb7cb68dbb7cc7d3d09ebe20492234b661d096df1db448af9b9eca55ded5
 DIST pconfigure-0.11.7.tar.gz 307675 BLAKE2B 724427c502ce52e8973e783e7827a01d3f98364bee8fc1dc8f81b5bdd8739563f657d88e533a3fcff36e0ea0c576dbaf2f1229fcfade54f244920ca850b03a52 SHA512 81a6aef6a12e0cfa34b686671378d93b4e2c71add554f038aa9ec13fc38a436e41395fbcaf1ca2d38b6646e6f0d9c2797968aec2d134c15bbf0bb45470cd3215
@@ -9,5 +10,6 @@ DIST pconfigure-0.9.4.tar.gz 164913 BLAKE2B 03c7e036658534026b1fe97a032ff287f4fb
 EBUILD pconfigure-0.10.4.ebuild 906 BLAKE2B 0bac29902c5d92d8e5fc33c22f6c49bf77023167ac3f1c13f4d66bac0926f68546ab219c8b7f2ee6332cb6824014ca199195c201d5bc432993ec7026d3dbcd8f SHA512 68eb99223a13267784e0fc9f33982fda683bc068b87b6d6969414bc85cc0913365f0494faacf13391ad94c5646746472634b581983b1f9df2f2a8b3723200a42
 EBUILD pconfigure-0.11.7.ebuild 971 BLAKE2B 637c6e41e98a48707e3137fdf5246f30a0c8b15d29bf8131c16a632d0e9cbb889d295b21c7039ba77e7002fd6ae1f5f5e3ea32612bde6c08bfbfacd3389632d1 SHA512 dbf5a27dc8d57e53e2a9186f7a5bb44f34a82df4d63b1cebe4723ec590ae21554c23e7e7fe0ec9d9387edc6b62c41dc6d6b54eaa80b2e63767d0af66ded5cea2
 EBUILD pconfigure-0.12.0.ebuild 971 BLAKE2B 637c6e41e98a48707e3137fdf5246f30a0c8b15d29bf8131c16a632d0e9cbb889d295b21c7039ba77e7002fd6ae1f5f5e3ea32612bde6c08bfbfacd3389632d1 SHA512 dbf5a27dc8d57e53e2a9186f7a5bb44f34a82df4d63b1cebe4723ec590ae21554c23e7e7fe0ec9d9387edc6b62c41dc6d6b54eaa80b2e63767d0af66ded5cea2
-EBUILD pconfigure-0.12.5.ebuild 1163 BLAKE2B 2ef37a514334be9e227b76015810e446c48068e6bb226998db50504b28aff8a819b1de9d917554241f9bd2679dea62dc2a0788585cf0ec14509e539ab86afaa7 SHA512 d3153b76bd786d956baa99fe93397d83769f8933051fd77eecce945293d04831f27444d81ac1c520094d6626fb588780f9012ec03905f384e4ede7420d6931e4
+EBUILD pconfigure-0.12.5-r1.ebuild 1401 BLAKE2B 0b53cb3656cf9727264c71f64536d0abbdf08c43dc527d48523f28c4e5fa69c21f784916ea8ee6a28e6fdcbfc51ecdd63a6f7e7fd4cb9db4785c03c4dab420b6 SHA512 3ad350b10f07655c379d8bc50580a5f52ce49fb4efacf2883840d2c7e5685ad0bcfec180d624fae1b33dd758ef4039d4cd2e5c90fd455f1ef9f95f07a62475c2
+EBUILD pconfigure-0.12.5.ebuild 1323 BLAKE2B 6b8617ef099e400974b83e1cbbf4866a01c2a06bcdaf475981f5e337c7501cee666ba6613e6de8645a37c3aca9691cdd621d3f936cf7ecb7425ad64a0c1c3d11 SHA512 e4f6b2490f5adf836676ed7e8e105898d3909d5c0bdc298518134229b53dd7433cc945af5fcaaf43bc818fdd9c4a66f9e9799e4d6667b0736079fe4c5a1a7604
 EBUILD pconfigure-0.9.4-r1.ebuild 907 BLAKE2B b2148e28d60c92a3afd207946f3d0c5f96221914e278e071a2c2a11c8c288bbfd14a7ce82b050e2886e3041a58905589cfde601c1ab6bfe856d864971cd5992c SHA512 ef2b4acafceee35f165b6e4fa6c2b1b38c2b7e87a86284fc246bf0dbff1198819a84e657dca4acc34aa8af8d8e7166ffcc471cfdbb75a23d0e1dda3a7989dedc
diff --git a/sys-devel/pconfigure/files/pconfigure-0.12.5-libdir.patch b/sys-devel/pconfigure/files/pconfigure-0.12.5-libdir.patch
new file mode 100644
index 0000000..ee43497
--- /dev/null
+++ b/sys-devel/pconfigure/files/pconfigure-0.12.5-libdir.patch
@@ -0,0 +1,37 @@
+commit 32e46a1fee1091ae58af51b7739da3f92f63ceba
+gpg: Signature made Fri 19 Apr 2019 09:43:03 PM PDT
+gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
+gpg:                issuer "palmer@dabbelt.com"
+gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate]
+gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate]
+Author: Palmer Dabbelt <palmer@dabbelt.com>
+Date:   Fri Apr 19 21:42:37 2019 -0700
+
+    Allow the build system to set LIBDIR
+    
+    This should allow me to pass Gentoo's strict-multlib tests.
+    
+    Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
+
+diff --git a/src/libpconfigure/context.c++ b/src/libpconfigure/context.c++
+index 234257f9b94e..77f1bef35241 100644
+--- a/src/libpconfigure/context.c++
++++ b/src/libpconfigure/context.c++
+@@ -22,12 +22,16 @@
+ #include "language_list.h++"
+ #include <sstream>
+ 
++#ifndef PCONFIGURE_LIBDIR
++#define PCONFIGURE_LIBDIR "lib"
++#endif
++
+ context::context(void)
+     : type(context_type::DEFAULT),
+       prefix("/usr/local"),
+       gen_dir("obj/proc"),
+       bin_dir("bin"),
+-      lib_dir("lib"),
++      lib_dir(PCONFIGURE_LIBDIR),
+       libexec_dir("libexec"),
+       obj_dir("obj"),
+       src_dir("src"),
diff --git a/sys-devel/pconfigure/pconfigure-0.12.5-r1.ebuild b/sys-devel/pconfigure/pconfigure-0.12.5-r1.ebuild
new file mode 100644
index 0000000..1446ef2
--- /dev/null
+++ b/sys-devel/pconfigure/pconfigure-0.12.5-r1.ebuild
@@ -0,0 +1,49 @@
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Palmer Dabbelt's Configure Replacement"
+HOMEPAGE="http://www.dabbelt.com/~palmer/software/pconfigure/"
+SRC_URI="https://github.com/palmer-dabbelt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 amd64-linux arm"
+IUSE="scala"
+
+RDEPEND="dev-util/pkgconfig
+         dev-util/strace
+         sys-devel/make
+         sys-devel/gcc
+         sys-libs/talloc
+         scala? ( dev-lang/scala )
+         "
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+    epatch "${FILESDIR}/${P}-libdir.patch"
+    epatch_user
+}
+
+src_configure() {
+    echo "LIBDIR = lib64" >> Configfile.local
+
+    echo "LANGUAGES += c" >> Configfile.local
+    for i in $(echo ${CFLAGS}); do
+        echo "COMPILEOPTS += ${i}" >> Configfile.local
+    done
+    echo "COMPILEOPTS += -DPBASHC_SHEBANG=\\\"\#\!${EPREFIX}/bin/bash\\\""\
+         >> Configfile.local
+    echo "COMPILEOPTS += -DPCONFIGURE_LIBDIR=\\\"lib64\\\"" >> Configfile.local
+
+    echo "LANGUAGES += c++" >> Configfile.local
+    for i in $(echo ${CXXFLAGS}); do
+        echo "COMPILEOPTS += ${i}" >> Configfile.local
+    done
+    echo "COMPILEOPTS += -DPBASHC_SHEBANG=\\\"\#\!${EPREFIX}/bin/bash\\\""\
+         >> Configfile.local
+    echo "COMPILEOPTS += -DPCONFIGURE_LIBDIR=\\\"lib64\\\"" >> Configfile.local
+
+    sh bootstrap.sh --prefix ${EPREFIX}/usr \
+           || die "Failed to bootstap pconfigure"
+}