commit: 38e551125e32d28729d42a0a0a07de94243d5629 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 12 00:11:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 12 00:11:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e55112
dev-debug/dtrace: fix build on no-multilib profiles Set NATIVE_BITNESS_ONLY=1 if we don't have multilib. Closes: https://bugs.gentoo.org/959876 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{dtrace-9999.ebuild => dtrace-2.0.3-r1.ebuild} | 16 +++++++++++----- dev-debug/dtrace/dtrace-9999.ebuild | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dev-debug/dtrace/dtrace-9999.ebuild b/dev-debug/dtrace/dtrace-2.0.3-r1.ebuild similarity index 95% copy from dev-debug/dtrace/dtrace-9999.ebuild copy to dev-debug/dtrace/dtrace-2.0.3-r1.ebuild index 22109e3bce63..adf19369b700 100644 --- a/dev-debug/dtrace/dtrace-9999.ebuild +++ b/dev-debug/dtrace/dtrace-2.0.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit edo flag-o-matic linux-info systemd toolchain-funcs udev +inherit edo flag-o-matic linux-info multilib systemd toolchain-funcs udev DESCRIPTION="Dynamic BPF-based system-wide tracing tool" HOMEPAGE="https://github.com/oracle/dtrace-utils https://wiki.gentoo.org/wiki/DTrace"; @@ -23,9 +23,6 @@ LICENSE="UPL-1.0" SLOT="0" IUSE="test-install valgrind" -# XXX: right now, we auto-adapt to whether multilibs are present: -# should we force them to be? how? -# # TODO: can we make the wireshark dep conditional? DEPEND=" dev-libs/elfutils @@ -145,8 +142,17 @@ src_configure() { } src_compile() { + local myemakeargs=( + verbose=1 + $(usev !test-install TRIGGERS='') + ) + + if use amd64 ; then + ! has_multilib_profile && myemakeargs+=( NATIVE_BITNESS_ONLY=1 ) + fi + # -j1: https://github.com/oracle/dtrace-utils/issues/82 - emake verbose=1 -j1 $(usev !test-install TRIGGERS='') + emake -j1 "${myemakeargs[@]}" } src_test() { diff --git a/dev-debug/dtrace/dtrace-9999.ebuild b/dev-debug/dtrace/dtrace-9999.ebuild index 22109e3bce63..adf19369b700 100644 --- a/dev-debug/dtrace/dtrace-9999.ebuild +++ b/dev-debug/dtrace/dtrace-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit edo flag-o-matic linux-info systemd toolchain-funcs udev +inherit edo flag-o-matic linux-info multilib systemd toolchain-funcs udev DESCRIPTION="Dynamic BPF-based system-wide tracing tool" HOMEPAGE="https://github.com/oracle/dtrace-utils https://wiki.gentoo.org/wiki/DTrace"; @@ -23,9 +23,6 @@ LICENSE="UPL-1.0" SLOT="0" IUSE="test-install valgrind" -# XXX: right now, we auto-adapt to whether multilibs are present: -# should we force them to be? how? -# # TODO: can we make the wireshark dep conditional? DEPEND=" dev-libs/elfutils @@ -145,8 +142,17 @@ src_configure() { } src_compile() { + local myemakeargs=( + verbose=1 + $(usev !test-install TRIGGERS='') + ) + + if use amd64 ; then + ! has_multilib_profile && myemakeargs+=( NATIVE_BITNESS_ONLY=1 ) + fi + # -j1: https://github.com/oracle/dtrace-utils/issues/82 - emake verbose=1 -j1 $(usev !test-install TRIGGERS='') + emake -j1 "${myemakeargs[@]}" } src_test() {
