From nobody Thu Jun 01 14:57:26 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QX8PM28Nbz4Yc54; Thu, 1 Jun 2023 14:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QX8PM1YFSz3Ccs; Thu, 1 Jun 2023 14:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685631447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a2/qgXR/chx7k8qNoQUgpuhhYcQHcrangXo9NbgiFUY=; b=dhVXHuKtV3nqdkiwhodA743Q5mAKvoTtwH2+dU4C74j/Fb1MQ9IHL2IDZR80Dd4hcry3DB 4SiblVqEeea92GAXJvusxWa/7k+3NRP1eL3WTqiih65L0AjE9WtCEs5rQl7VnvY3J2CP73 Pe4JsVenDZ7Ib+3psJauVUXX1WMuVmJ348GbyXEWen7O/LOwSL2jRlx1Ht6Dg9vATgvNkT EM6g984lNDUIBCtUkHII+TlVRrpECvFg7x4PRZrT3sKgPO3UZQJl5pI4bq9+ArfLtm5PfT wt5koQI8Bw+DD/8lphHkW90TKWzW41+gi2E8OPuwJV0M8aZwMLmhkMF1Qwtbcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685631447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a2/qgXR/chx7k8qNoQUgpuhhYcQHcrangXo9NbgiFUY=; b=l/hKyS6aI2zKujz0QwFvzZWCniKMIP0wYNHR0a9zpuLKWKeyceXy7INcHpt80iq+tpjWTM MkSX4eJXR6MIUM+evM6lQNcDw4s63mrF7NiC/BS3N3Rfh6D0nXuBrWMATbADw2bpbJMlu/ wdnVK9uQWR/mabBtVjZpKTHKEFmcdZisBmLqEk4vwnVp7dpf9VVLcc6LlM4czqhZ07/y1S +ygL7zacbcsB41Ewmfr8TZikS6cULgr9YJtJZp8z6wNvxEB693ZTitZgTc8Py0WvF6eNl+ 14CYrRhMIwFTGPLL3yPWz2R/kBtUIvjoLZrVnZ479fQdEZ5A8Z4cenx+gBvtrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685631447; a=rsa-sha256; cv=none; b=pUH+XxhOD6O/e390Es3YuPXZUUbPJ28VhVd11Gx5DL/sSZ65uMa0Ueh6uVKW2KrlXvduYu HtAYgEPvcXxqFtOIM7747bI9HjXm5KYV6EAzgYlrXYYYSsZjBk10Q9v8IpTMAvfLnwP3ct pNuVXGzhhP2uFssKhUcE57hAiwypy/rdCkLowD5U2BPAwGfFC6Q4IuHmYG2TR5tprL/0EA pUWLw07GFLYb48Wv66z5DpBUlZ9yNjkASjTt4NoG+LyS7j2CdaRx0UU7ckjSud0JYRjUwl ierY2SwQK2pgTtUPasxmBhMlSoGqlHotgIcGdJ0EF9JO/SA/JpeAtEHuCaDHeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QX8PM0JzPzMJb; Thu, 1 Jun 2023 14:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351EvQpg051205; Thu, 1 Jun 2023 14:57:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351EvQf4051204; Thu, 1 Jun 2023 14:57:26 GMT (envelope-from git) Date: Thu, 1 Jun 2023 14:57:26 GMT Message-Id: <202306011457.351EvQf4051204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: a26a1d677383 - 2023Q2 - emulators/virtualbox-ose: on 14 "Failed to construct device 'VMMDev' instance #0 (VERR_INTERNAL_ERROR_3)" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: a26a1d677383f569c833afc39e0db01d3e7a67ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a26a1d677383f569c833afc39e0db01d3e7a67ab commit a26a1d677383f569c833afc39e0db01d3e7a67ab Author: Vladimir Druzenko AuthorDate: 2023-06-01 14:44:38 +0000 Commit: Vladimir Druzenko CommitDate: 2023-06-01 14:57:11 +0000 emulators/virtualbox-ose: on 14 "Failed to construct device 'VMMDev' instance #0 (VERR_INTERNAL_ERROR_3)" Force llvm from ports from 11 to 14 - by default it'll pick 14. Use VBOX_LLVM_VER in make.conf to define different llvm. PR: 270189 Reviewed by: cy, grahamperrin Tested by: cy, grahamperrin, groenveld@acm.org, rkoberman@gmail.com Approved by: arrowd Differential Revision: https://reviews.freebsd.org/D40254 (cherry picked from commit e6b21a9e3f0a605c06d54737a8ff4d6db82dabe5) --- emulators/virtualbox-ose/Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index d6de1b73c8b7..5f6a1975304a 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,5 +1,6 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.44 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -216,14 +217,25 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src_VBox_Devices_PC_DevFwCommon.cpp .endif .if ${CHOSEN_COMPILER_TYPE} == clang -# llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors. -# force llvm11 from ports +# 1) llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors. +# 2) llvm15 in FreeBSD miscompiles virtualbox 6.1 causing errors: PR#270189. +# Force llvm from ports. .if ${OPSYS} == FreeBSD && \ - (${OSVERSION} < 1203502 || ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300109) + (${OSVERSION} < 1203502 || ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300109 || \ + ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 || ${OSVERSION} >= 1400079) +# USES must be before .include , but CHOSEN_COMPILER_TYPE must be after. +# This is a workaround with possibility to define different llvm via VBOX_LLVM_VER in make.conf. +#USES+= llvm:min=11,max=14 +#CC= clang${LLVM_VERSION} +#CXX= clang++${LLVM_VERSION} BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 11 +.if ${LLVM_DEFAULT} < 11 || ${LLVM_DEFAULT} > 14 +VBOX_LLVM_VER?= 14 +.else +VBOX_LLVM_VER?= ${LLVM_DEFAULT} +.endif .endif PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk