From nobody Tue Sep 12 12:00:19 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 4RlMbR2hlzz4tZpJ; Tue, 12 Sep 2023 12:00:19 +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 4RlMbR2G98z3T9f; Tue, 12 Sep 2023 12:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694520019; 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=qlJHGbQq4Wki8/+78YHOTF0/QgINyFzTYzBRQWWvh0g=; b=VBDD8QCbLXb4DDd/lt951UZQqLXyGHePtk9BOQeNKcC8cCK+MujpVeh8fQxVX2US1ceCGu N6OQcg51VCnlaiWgXkWmYvgnDstcO3j34vDZwkZjg8Oy3p7yAMGiAKaL4lTpRgVx8sqa64 asWLlFSuxk+vO1V5JBm0swamFC6cU1BTBGpAWDf/U9HyrJzvsEI9tJPOSIvDH/rfa4WolZ WlF4U7TqQ0ICO63hIUijQNgo42yEAcUc/vrBDJgtdti/LYd3TVU/suNkHZhWlfGsMuru9t /JIsHoJ2Ldd72mOh/LgDML9UyZKVFcyrrRlewtWd3LMaXIEuDUIb54KJ6C/hxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694520019; a=rsa-sha256; cv=none; b=W4JhQJx5Efxx+yJGsXXKcKwVf8nfNcxOJAp1JBWtWlkUbJT+sIMtW255w8Cz0kbH42AFCc K43OXo3D9KYV7obLE+Y+cPU+1+bh6MWWesBDtPX9wRyTvd7UmQel8/RLINJ05hz/esWwNs CMBa4os2Z/vg42v+y09IcbaAtCBkmbkdm5/GWsmUxOM/5N5FiKjLDHcjw1YnK7lcm7TmxV E/vqauozWNpPi9ErdfdpyHZDhibm9yZ90YYF+vNNY0bxVvcDOtuh1E5F1U1o0Agt+If3qh VolfhWZGyZCwsar6P56sOzcBq7W0ulmScRk/ffaHir17mkJQFWdxyoK9Vo0SJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694520019; 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=qlJHGbQq4Wki8/+78YHOTF0/QgINyFzTYzBRQWWvh0g=; b=d1nowVDTH5Ywe4msJjyEDxMbRJJvJ+1ldrATw5xFsaExZsGxtRXmKywJKNzOS18AuUVkK/ 66edmyHyg7q3NZEOGZeqZZzuf7I98fj1Ygg57TtPzCB+C4UNn9u2x4MGrDaSIAkluiqmTK EkXj47B+TNKz0dNmZRY3jsLlYV+7vHe10pUgtCcXwSfKH3FwA5qXjcSWSm5mNTW5lSERL+ maju/V2UDBQmNgd+bMzEA7Skk4bUy5UThJI+0F8W8VzsQVQC+qN54nFTSMZSKEacI/1ZdQ gU4cToadM3uVtKvya5AbsHUwXQGVVRxo2dl0KIFcITpOSl9QPvX1wVsjla3XKg== 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 4RlMbR1JxjzWwY; Tue, 12 Sep 2023 12:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CC0Jcr097111; Tue, 12 Sep 2023 12:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CC0J8C097108; Tue, 12 Sep 2023 12:00:19 GMT (envelope-from git) Date: Tue, 12 Sep 2023 12:00:19 GMT Message-Id: <202309121200.38CC0J8C097108@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: de862b33d480 - main - emulators/virtualbox-ose: fix build errors on CURRENT 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: corvink X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de862b33d480559301360c44d840ae12ee4bcfb4 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/ports/commit/?id=de862b33d480559301360c44d840ae12ee4bcfb4 commit de862b33d480559301360c44d840ae12ee4bcfb4 Author: Kurosawa Takahiro AuthorDate: 2023-09-12 11:55:04 +0000 Commit: Corvin Köhne CommitDate: 2023-09-12 12:00:14 +0000 emulators/virtualbox-ose: fix build errors on CURRENT PR: 272991 Reviewed by: corvink, manu Approved by: manu, vbox (maintainer timeout) --- emulators/virtualbox-ose-additions/Makefile | 2 ++ .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h | 10 ++++++++-- .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c | 2 +- .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 609337173458..6a2e8cbd2916 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -99,6 +99,8 @@ post-patch: @${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO_CMD} 'CXXDEFS += _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR' >> \ + ${WRKSRC}/LocalConfig.kmk .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -fno-merge-constants||' \ diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h index a4f94f92e148..3551533f2bcd 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h @@ -9,7 +9,7 @@ /* * Copyright (C) 2010-2020 Oracle Corporation * -@@ -24,72 +19,371 @@ +@@ -24,72 +19,377 @@ #define VBOXVFS_VFSNAME "vboxvfs" #define VBOXVFS_VERSION 1 @@ -134,6 +134,12 @@ - int didrele; +#include + ++#if __FreeBSD_version >= 1400093 ++typedef __enum_uint8(vtype) enum_vtype_t; ++#else ++typedef enum vtype enum_vtype_t; ++#endif ++ +#define VBOXVFS_DEBUG(lvl, ...) do { \ + if (vboxvfs_debug >= (lvl)) { \ + printf("VBOXVFS[%u]: ", lvl); \ @@ -323,7 +329,7 @@ +void vboxfs_free_vp(struct vnode *); + +int vboxfs_alloc_node(struct mount *, struct vboxfs_mnt *, const char*, -+ enum vtype, uid_t, gid_t, mode_t, struct vboxfs_node *, ++ enum_vtype_t, uid_t, gid_t, mode_t, struct vboxfs_node *, + struct vboxfs_node **); +void vboxfs_free_node(struct vboxfs_mnt *, struct vboxfs_node *); + diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c index c37baa13efc4..be9d416aa3bf 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c @@ -130,7 +130,7 @@ + */ +int +vboxfs_alloc_node(struct mount *mp, struct vboxfs_mnt *vsfmp, const char *fullpath, -+ enum vtype type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent, ++ enum_vtype_t type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent, + struct vboxfs_node **node) { - struct vboxvfs_mount_info args; diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index b2f56a2bbd28..d0da1fbf3f45 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -420,7 +420,7 @@ + */ +static int +vboxfs_alloc_file(struct vboxfs_mnt *vboxfsmp, const char *fullpath, -+ enum vtype type, mode_t mode, struct vboxfs_node *parent, ++ enum_vtype_t type, mode_t mode, struct vboxfs_node *parent, + int lkflag, struct vnode **vpp) { - return 0;