From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 90E2B158094 for ; Wed, 6 Jul 2022 03:01:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6B8EE0A9C; Wed, 6 Jul 2022 03:01:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE868E0A9C for ; Wed, 6 Jul 2022 03:01:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76AED34195E for ; Wed, 6 Jul 2022 03:01:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98E82501 for ; Wed, 6 Jul 2022 03:01:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657073983.9a09586677da244bdd6db9c8196cf0f49f5e2a66.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild X-VCS-Directories: app-emulation/virtualbox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9a09586677da244bdd6db9c8196cf0f49f5e2a66 X-VCS-Branch: master Date: Wed, 6 Jul 2022 03:01:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0db664a5-09a7-4dea-9aca-b2a1ff033287 X-Archives-Hash: e816c7cfc80afd80014848895092ec89 commit: 9a09586677da244bdd6db9c8196cf0f49f5e2a66 Author: Sam James gentoo org> AuthorDate: Wed Jul 6 02:19:43 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 6 02:19:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a095866 app-emulation/virtualbox: minor ebuild tidying Signed-off-by: Sam James gentoo.org> .../virtualbox/virtualbox-6.1.34-r3.ebuild | 31 ++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild index 3920e11b0d57..388c4e9cc7c0 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg +inherit desktop edo java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg MY_PN="VirtualBox" MY_PV="${PV/beta/BETA}" @@ -161,17 +161,13 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup python-single-r1_pkg_setup - - tc-ld-disable-gold #bug 488176 - tc-export CC CXX LD AR RANLIB - export HOST_CC="$(tc-getBUILD_CC)" } src_prepare() { # Remove shipped binaries (kBuild,yasm), see bug #232775 rm -r kBuild/bin tools || die - # Replace pointless GCC version check with something less stupid. + # Replace pointless GCC version check with something more sensible. # This is needed for the qt5 version check. sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \ -i configure || die @@ -227,11 +223,17 @@ src_prepare() { } src_configure() { + tc-ld-disable-gold # bug #488176 + tc-export CC CXX LD AR RANLIB + export HOST_CC="$(tc-getBUILD_CC)" + local myconf=( --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" + --disable-dbus --disable-kmods + $(usex alsa '' --disable-alsa) $(usex debug --build-debug '') $(usex doc '' --disable-docs) @@ -243,6 +245,7 @@ src_configure() { $(usex vboxwebsrv --enable-webservice '') $(usex vnc --enable-vnc '') ) + if ! use headless ; then myconf+=( $(usex opengl '' --disable-opengl) @@ -254,10 +257,12 @@ src_configure() { --disable-opengl ) fi + if use amd64 && ! has_multilib_profile ; then myconf+=( --disable-vmmraw ) fi + # bug #843437 cat >> LocalConfig.kmk <<-EOF || die CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} @@ -271,14 +276,18 @@ src_compile() { source ./env.sh || die # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) - MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' + MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" + MAKE="kmk" emake \ VBOX_BUILD_PUBLISHER=_Gentoo \ - TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \ - TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \ - TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ + TOOL_GXX3_CC="$(tc-getCC)" \ + TOOL_GXX3_CXX="$(tc-getCXX)" \ + TOOL_GXX3_LD="$(tc-getCXX)" \ + VBOX_GCC_OPT="${CXXFLAGS}" \ + TOOL_YASM_AS=yasm \ + KBUILD_VERBOSE=2 \ VBOX_WITH_VBOXIMGMOUNT=1 \ all }