From nobody Tue May 23 18:24:25 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 4QQjQL1YGYz4CmpL; Tue, 23 May 2023 18:24:26 +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 4QQjQL0wxCz3GGH; Tue, 23 May 2023 18:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684866266; 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=SLlbdyRBHlqZSXi2221YWTDHCH+guokFov5GSJbTx5Q=; b=n64LZMXoTiplzvF98IH7EpFuoDI91EzRYUpUWFadLxfREWqZfU2kFlZScaWCeq6IV3uWSV 3t/QX5+E5bfG/qaBEiXu2uAwP5vys7gv1ngkzJSsHIPlJAwFkm3YCEe/qghIzQFdbJvcEC wuf62bcOWVRpjmukwEGYcW4f/eAV5nv3txGcX41l9WaZzO4/lrebM6CaK44N8FhaEsLJmv bpMF+qgvagPv/OAcvA5kU3gPQW1KuLvtsQ4kYKVLgTJ+FuYc646lcKJEUTLBBwpSvCF2Av 9h72G8gizAjphoPntiWmPdOOMcsLmKW7OBW41UTebaQNNBc+pnSJLyToWTedGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684866266; 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=SLlbdyRBHlqZSXi2221YWTDHCH+guokFov5GSJbTx5Q=; b=NqEF4WUO1QgQEbsycTl0c1INOugQQhyrMkuTy7oj/5iFvq4uhqWaobb2TYOH2HEm+IiG5X KuLo4VYXTBxyf9PETRHkmevyRP8dqxOStWaRAYTiUtBV/6qhHX0mh0S5UMbwgE9mdL9dHd xG+2anctLpURrWivP5YC9nb1B3OIGHURhKcZZ15eFSvVwpGbwHhuM/fsl9bQHdMebfNsAb g5bybwFihBlhL8jauoTldH64EsgQjoUU8KOPqm8KzmAhDgPHgfNLA9yogvGDpC6y/4JhLb +n71c629yWjBgCc+m1pZpJ53fSK5uYDQBVn6eAML9MrjWm/0jlWErmVwg7ADSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684866266; a=rsa-sha256; cv=none; b=y3w4UBNNTMizBNIarzO0EVs0DJicnY8VX0F3M9dlz6ekba8x6SuX+0WU2lSreiQFJ7LZoC 9+bNjbFROPH4/APrMmEIfn4n0N25ja7mrtcIktWZBCrAdtAfYvSzCH5L1ZT4Kb91qMgn4g B8plErQmntn1hmMmunouiX8hmTrEZtLUTRjESY7ukhP5sQwOJTxluOVntjJIVBpeBppQPQ tZKJclhKkSXIab/i1/Q4jAQutKKqkl3iuafS3sRjdxM347RIABusmOhjDMkUtWZqVY/ayC iItY5k/it80HTlrnsgMde9QfgJEuynK5wExkypUaAqApDt7gv+L+pXgUTnupMg== 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 4QQjQK71GDz193k; Tue, 23 May 2023 18:24:25 +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 34NIOPm1011889; Tue, 23 May 2023 18:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NIOPU0011888; Tue, 23 May 2023 18:24:25 GMT (envelope-from git) Date: Tue, 23 May 2023 18:24:25 GMT Message-Id: <202305231824.34NIOPU0011888@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: a39a00bddf99 - main - emulators/virtualbox-ose: error: use of undeclared identifier 'mempcpy' 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/main X-Git-Reftype: branch X-Git-Commit: a39a00bddf995d665bb4ba4e89d7403d14060a6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a39a00bddf995d665bb4ba4e89d7403d14060a6f commit a39a00bddf995d665bb4ba4e89d7403d14060a6f Author: Vladimir Druzenko AuthorDate: 2023-05-23 18:10:50 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-23 18:24:21 +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 --- 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 82c5fc047dd6..cda9d742e9eb 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -211,10 +211,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 *