[PATCH 65/94] sys-kernel/rumpkernel: don't assume x86
Sam James <[email protected]>
| Newsgroups | gmane.linux.gentoo.devel |
|---|---|
| Message-ID | <86264710f89720f42b63b49c4c299e16c33014dc.1774994348.git.sam@gentoo.org> |
Signed-off-by: Sam James <[email protected]> --- .../rumpkernel-0_p20250111_p6.ebuild | 18 ++++++++++++++---- sys-kernel/rumpkernel/rumpkernel-9999.ebuild | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/sys-kernel/rumpkernel/rumpkernel-0_p20250111_p6.ebuild b/sys-kernel/rumpkernel/rumpkernel-0_p20250111_p6.ebuild index a4ca330bb64b3..a305d4225cb13 100644 --- a/sys-kernel/rumpkernel/rumpkernel-0_p20250111_p6.ebuild +++ b/sys-kernel/rumpkernel/rumpkernel-0_p20250111_p6.ebuild @@ -4,7 +4,6 @@ EAPI=8 # TODO: check for any automagic dependencies, possible USE flags -# TODO: make building for x86_64 work (don't hardcode i386) # TODO: make building natively work inherit flag-o-matic multiprocessing toolchain-funcs @@ -75,7 +74,18 @@ src_configure() { cd buildrump.sh/src/lib/librumpuser || die "Couldn't change to the build directory" econf - NBMAKE="${S}"/buildrump.sh/src/obj/tooldir/bin/nbmake-i386 + case ${CHOST} in + i[3-7]86*) + NBARCH=i386 + ;; + x86_64*) + NBARCH=amd64 + ;; + *) + die "Unknown NetBSD arch for this CHOST" + ;; + esac + NBMAKE="${S}"/buildrump.sh/src/obj/tooldir/bin/nbmake-${NBARCH} } src_compile() { @@ -83,7 +93,7 @@ src_compile() { mkdir -p obj || die "Couldn't make obj dir" local buildrump_cppflags=( - -I"${S}"/buildrump.sh/src/obj/destdir.i386/usr/include + -I"${S}"/buildrump.sh/src/obj/destdir.${NBARCH}/usr/include -D_FILE_OFFSET_BITS=64 -DRUMP_REGISTER_T=int @@ -138,7 +148,7 @@ src_compile() { -V MIG=${CHOST}-mig # XXX - -m i386 + -m ${NBARCH} -U -u -j $(get_makeopts_jobs) -T ./obj/tooldir diff --git a/sys-kernel/rumpkernel/rumpkernel-9999.ebuild b/sys-kernel/rumpkernel/rumpkernel-9999.ebuild index a4ca330bb64b3..a305d4225cb13 100644 --- a/sys-kernel/rumpkernel/rumpkernel-9999.ebuild +++ b/sys-kernel/rumpkernel/rumpkernel-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 # TODO: check for any automagic dependencies, possible USE flags -# TODO: make building for x86_64 work (don't hardcode i386) # TODO: make building natively work inherit flag-o-matic multiprocessing toolchain-funcs @@ -75,7 +74,18 @@ src_configure() { cd buildrump.sh/src/lib/librumpuser || die "Couldn't change to the build directory" econf - NBMAKE="${S}"/buildrump.sh/src/obj/tooldir/bin/nbmake-i386 + case ${CHOST} in + i[3-7]86*) + NBARCH=i386 + ;; + x86_64*) + NBARCH=amd64 + ;; + *) + die "Unknown NetBSD arch for this CHOST" + ;; + esac + NBMAKE="${S}"/buildrump.sh/src/obj/tooldir/bin/nbmake-${NBARCH} } src_compile() { @@ -83,7 +93,7 @@ src_compile() { mkdir -p obj || die "Couldn't make obj dir" local buildrump_cppflags=( - -I"${S}"/buildrump.sh/src/obj/destdir.i386/usr/include + -I"${S}"/buildrump.sh/src/obj/destdir.${NBARCH}/usr/include -D_FILE_OFFSET_BITS=64 -DRUMP_REGISTER_T=int @@ -138,7 +148,7 @@ src_compile() { -V MIG=${CHOST}-mig # XXX - -m i386 + -m ${NBARCH} -U -u -j $(get_makeopts_jobs) -T ./obj/tooldir -- 2.53.0