From nobody Thu Jun 01 14:53:07 2023 X-Original-To: dev-commits-ports-main@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 4QX8JN1SbBz4Ybxt; Thu, 1 Jun 2023 14:53:08 +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 4QX8JN0ltfz3C0B; Thu, 1 Jun 2023 14:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685631188; 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=B5UDdKVy0vnffRhMGHJTNcdEHyug5sixUez4AqJTchA=; b=CbhXt6Tb0pH+Cp7a9IfRzZ/Y0fL43Xb+Bah2awugHhTaeMdkYfBDkTxKtfeDcwP8XEifL0 l9fyFCILrezllbLqGx3lYrjAtLjAm48UeYvBCclDKnv0FhrTBQsne+k7EF3lXpWAOaZv6e TmrvbSogc8ZpCcHbrquIOQIwhrbDmd3HuM23uQHW6GagMALSMy3qs60Np7blUlyPmfRlh1 WvYz+0ZQSSUTIJwoyGax7ZRvwN4LXLbIOOnIlKVG91CWhHYIWOZ1ayUZOXmEf+up9MCAw2 9m3cH+I+XVoMlsIhEDgMNMZG23B4aO/BcqC++YFzAdPS4nf8aadigiVep0GYGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685631188; 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=B5UDdKVy0vnffRhMGHJTNcdEHyug5sixUez4AqJTchA=; b=yhX4qisCz3JvY9cQQ0s501lqZFOzKt553fVes+iQ7Av/myjmGGs9wFT3uJd//cX6+Zt4Vq 4tbM8ACdCsn4bgLn6tSKTuHDXCi0S+kF7qS159SWdvLZhTOWNZ0NviXCpnjs3PK68dgpyj KxRgIR9puET5/SThzG+qy1u0Y5FJxgd5u1YldvKxzNj+FeZ9SFnIHv97CKCxqQ7ChTt70j twSLp9NwQpnwLOJSvT2M7VuG8Je0osPHWf1fclp0BtjukPbzgUCO4RzkDuW+TgitIIE/TY gnz3GDPTJ3KsQRuBhsGjOD4lxnRITo9CdrcwfKxLR7SkP8mI/5nILP3s5IM4Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685631188; a=rsa-sha256; cv=none; b=exezXe7w5wMkUbaghxyFmfGE6UOcfUeTl82IOx0gpiz2ZAe1Eoaom97wMecs7nRNHQk6KT TjcZ0IG/DfOP5Kv5Jesb9M0I43w/tFJuUJIo02VCvf7x84PDw/W0GWotZnVZFnatAYaNa1 EhlsrEUcooejr9oJF3ixk5m0qhSG2tDkKKimQQuQ+7LRRoP/Uh5+FKM6hkQsqMOcoXVdTH LehB/e7WmyblsiBtEM9kVDt0Nuj7hrPSDly6ApmxC75xg/l7Ca/zdLAt4K4ljwOwtOR0A+ aN+Thlae+eG5CGLpHu9BS2SduZNZA/bvCQ5DHDx8QDerjqNFQbHCyfgHhEJgDA== 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 4QX8JM6x0pzLr4; Thu, 1 Jun 2023 14:53:07 +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 351Er7LW050522; Thu, 1 Jun 2023 14:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351Er7Jp050521; Thu, 1 Jun 2023 14:53:07 GMT (envelope-from git) Date: Thu, 1 Jun 2023 14:53:07 GMT Message-Id: <202306011453.351Er7Jp050521@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: e6b21a9e3f0a - main - emulators/virtualbox-ose: on 14 "Failed to construct device 'VMMDev' instance #0 (VERR_INTERNAL_ERROR_3)" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: e6b21a9e3f0a605c06d54737a8ff4d6db82dabe5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6b21a9e3f0a605c06d54737a8ff4d6db82dabe5 commit e6b21a9e3f0a605c06d54737a8ff4d6db82dabe5 Author: Vladimir Druzenko AuthorDate: 2023-06-01 14:44:38 +0000 Commit: Vladimir Druzenko CommitDate: 2023-06-01 14:53:00 +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 --- emulators/virtualbox-ose/Makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index cda9d742e9eb..0e8237057799 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.44 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -217,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