From nobody Tue May 23 18:27:59 2023 X-Original-To: dev-commits-ports-branches@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 4QQjVS0JgLz4Cmy3; Tue, 23 May 2023 18:28:00 +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 4QQjVR6vmQz3GYk; Tue, 23 May 2023 18:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684866480; 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=1t5hDqS1NAW/7SV+2+A+YVMtb7S2Ph/OyqRgiUpatr4=; b=TW1IYWJfpN8w3YVwbBncnp9bPssjhVdyA839Ojs2o4/kcaqPYtggcKT3qEPqshJFxmcmpy PB8uciMyAmtNRBpPEJZ9BJK5SSLZ6cTKGs5C3N+DoGZXaVevU8fUTZhWBzmG+hI7c7rHOJ FsnTKh2ghmp3ZG1GsNSBpcTkGcNvjRY1ub/K53SfpkOzYwJpvFBRh9UMnQG2vKnGQei1aD Z6iO/DVj5l067oBgfLcQLFuKKURXZiOw+U4BzwVcliIWpctM+k4jvnvSwrTBl3pF+Nb2/n opJnXG7/De3pubyxyqz1TWGODVHnBcavpJfr8iLvIL4y37pwet5s7U+AKDT6Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684866480; 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=1t5hDqS1NAW/7SV+2+A+YVMtb7S2Ph/OyqRgiUpatr4=; b=Co15KnHKodoMmwfTc/jtjSyOB3/oV1KRi1Cm4Ij1BArjnLXexMd0AaEfqH90gnS+RognUn tm0v5RV7fUIqGKk+a63siNVbUg3E2Gxgl5kXuxPl032ZOSLNnbN2GTsjk4oKItII/dCqIQ 07juijVOu9oiK/t2wXzUMB6eTa35tALoL+rGCYarFNVOAD4WCFGH8FvmZvMF1hbXiwio6O dvo1FDL5R6cimTJD5bWx4t3nBiGS895mCpWjFCKIWIMWefD7lIHwh4fhp1M7EQetj0b+1+ vsToRwGSnS+cZaFAWv5ZIOn0TaQq9ZFM6vsrGknalarDScKxrPN2edahUZl1vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684866480; a=rsa-sha256; cv=none; b=yepGLXCTVPx3vlOYd1vPxBzG5W+HHGqgCBRzViIDoGBT/ZVtUGC5pmAw66FAMKDzlBxCgo +niK6wMNBuGpIyPyRZ5xO2WTBtk7j0QvYGYY/88g5ucFZFebcQkmjNeUymMDJusqPiF6uf TVCPOjSmylymcq+Uvesyhb310kpX4zjlrDRrb2Z6y+Ekm4UK6hp+cKp0H8RhgE9VkxDZyw Xu6bGtGq07RK+o6XnF+SdeSjcDz+4h0w/9OwfZelgKfQ26AtKUR1b1Zpu+rOqz6AGaNgRf lhd3L+GnEn7h/p3OL+oGN1jfFZB9sEf09Hsax5FATyCIUbH6zruyfvK0ZVv0UA== 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 4QQjVR5ffJz193m; Tue, 23 May 2023 18:27:59 +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 34NIRxUs012498; Tue, 23 May 2023 18:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NIRxPG012497; Tue, 23 May 2023 18:27:59 GMT (envelope-from git) Date: Tue, 23 May 2023 18:27:59 GMT Message-Id: <202305231827.34NIRxPG012497@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: 68c6dcb8f6de - 2023Q2 - emulators/virtualbox-ose: error: use of undeclared identifier 'mempcpy' List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 68c6dcb8f6de97814ee89b00b7bb354859406dee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=68c6dcb8f6de97814ee89b00b7bb354859406dee commit 68c6dcb8f6de97814ee89b00b7bb354859406dee Author: Vladimir Druzenko AuthorDate: 2023-05-23 18:10:50 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-23 18:27:50 +0000 emulators/virtualbox-ose: error: use of undeclared identifier 'mempcpy' 1. There are no mempcpy on 12, on 13 before 1300513 and on 14 before 1400026. Log with error is here: https://lists.freebsd.org/archives/freebsd-pkg-fallout/2023-May/402233.html 2. 12 have llvm11 in base after 1203502 (llvm12 after 1203503 and llvm13 after 1203505), so not need to force build with llvm11 from ports. Reported by: https://portsfallout.com/fallout?port=emulators%2Fvirtualbox-ose%24 Reviewed by: rene Approved by: arrowd (mentor), fuz Differential Revision: https://reviews.freebsd.org/D40163 (cherry picked from commit a39a00bddf995d665bb4ba4e89d7403d14060a6f) --- emulators/virtualbox-ose/Makefile | 8 +++++++- .../files/extrapatch-src_VBox_Devices_PC_DevFwCommon.cpp | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 541d4c63ae38..d6de1b73c8b7 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -210,10 +210,16 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .include +.if ${OPSYS} == FreeBSD && \ + (${OSVERSION} < 1300513 || ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400026) +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 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109 +.if ${OPSYS} == FreeBSD && \ + (${OSVERSION} < 1203502 || ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300109) BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER} diff --git a/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_DevFwCommon.cpp b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_DevFwCommon.cpp new file mode 100644 index 000000000000..2ee34f889bb6 --- /dev/null +++ b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_DevFwCommon.cpp @@ -0,0 +1,14 @@ +--- src/VBox/Devices/PC/DevFwCommon.cpp.orig ++++ src/VBox/Devices/PC/DevFwCommon.cpp +@@ -40,6 +40,11 @@ + #include "VBoxDD2.h" + #include "DevFwCommon.h" + ++static inline void * ++mempcpy(void *__restrict dst, const void *__restrict src, size_t len) ++{ ++ return ((char *)memcpy(dst, src, len) + len); ++} + + /********************************************************************************************************************************* + * Defined Constants And Macros *