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 3C47115806E for ; Sat, 3 Jun 2023 11:45:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E1D5E0880; Sat, 3 Jun 2023 11:45:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 2EB2CE0880 for ; Sat, 3 Jun 2023 11:45:26 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35981341344 for ; Sat, 3 Jun 2023 11:45:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C321A8DC for ; Sat, 3 Jun 2023 11:45:23 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1685792714.cd25a2bea10cd8673939b0e5b95d5df3a0802531.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild X-VCS-Directories: app-emulation/virtualbox-guest-additions/files/ app-emulation/virtualbox-guest-additions/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: cd25a2bea10cd8673939b0e5b95d5df3a0802531 X-VCS-Branch: master Date: Sat, 3 Jun 2023 11:45:23 +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: 39bc14e3-79a5-4354-9709-d46195adf5a2 X-Archives-Hash: 876520d5211482f1a4ac179ee187d6f3 commit: cd25a2bea10cd8673939b0e5b95d5df3a0802531 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Jun 3 10:24:59 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sat Jun 3 11:45:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd25a2be app-emulation/virtualbox-guest-additions: fix building with gcc-13 Closes: https://bugs.gentoo.org/907597 Closes: https://github.com/gentoo/gentoo/pull/31283 Signed-off-by: Viorel Munteanu gentoo.org> ...irtualbox-guest-additions-7.0.8-fix-gcc13.patch | 24 ++++++++++++++++++++++ .../virtualbox-guest-additions-6.1.44-r1.ebuild | 8 ++++++++ .../virtualbox-guest-additions-7.0.8-r2.ebuild | 1 + 3 files changed, 33 insertions(+) diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch new file mode 100644 index 000000000000..8e53107aedbc --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch @@ -0,0 +1,24 @@ +This file ends up included in +src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp which +is compiled with -ffreestanding, so it shouldn't include math.h + +See also: https://bugs.gentoo.org/907597 + +--- a/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h ++++ b/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +@@ -169,6 +169,7 @@ + #ifndef IN_MODULE + /* XXX Not for modules */ + #include ++#if defined __STDC_HOSTED__ && __STDC_HOSTED__ == 1 + #if !defined(MAXSHORT) || !defined(MINSHORT) || \ + !defined(MAXINT) || !defined(MININT) + /* +@@ -178,6 +179,7 @@ + + #include + #endif ++#endif // defined __STDC_HOSTED__ && __STDC_HOSTED__ == 1 + #undef MAXSHORT + #define MAXSHORT SHRT_MAX + #undef MINSHORT diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild index ea083a8adc9f..a40865cf1fec 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild @@ -57,12 +57,20 @@ PDEPEND=" X? ( x11-drivers/xf86-video-vboxvideo ) " +PATCHES=( + "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch + "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch + "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch +) + DOCS=() # Don't install the default README file during einstalldocs VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src" CONFIG_CHECK="DRM_TTM" src_prepare() { + eapply "${PATCHES[@]}" + # Remove shipped binaries (kBuild,yasm), see bug #232775 rm -r kBuild/bin tools || die diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild index 5657fcc424a6..3ae573b7e126 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild @@ -64,6 +64,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch + "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch ) DOCS=() # Don't install the default README file during einstalldocs