From owner-dev-commits-ports-all@freebsd.org Thu May 20 06:59:57 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1CD61636AB5; Thu, 20 May 2021 06:59:57 +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 4Fm0wr5GbRz4knd; Thu, 20 May 2021 06:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9A467217C2; Thu, 20 May 2021 06:59:56 +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 14K6xu92059379; Thu, 20 May 2021 06:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14K6xuAJ059378; Thu, 20 May 2021 06:59:56 GMT (envelope-from git) Date: Thu, 20 May 2021 06:59:56 GMT Message-Id: <202105200659.14K6xuAJ059378@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= Subject: git: 97632df2b3f8 - main - sysutils/xen-tools: fix build on FreeBSD 12 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97632df2b3f820f6cbd8a09602aa96af6aaec0f5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 06:59:57 -0000 The branch main has been updated by royger (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=97632df2b3f820f6cbd8a09602aa96af6aaec0f5 commit 97632df2b3f820f6cbd8a09602aa96af6aaec0f5 Author: Roger Pau Monné AuthorDate: 2021-05-17 13:38:12 +0000 Commit: Roger Pau Monné CommitDate: 2021-05-20 06:58:57 +0000 sysutils/xen-tools: fix build on FreeBSD 12 QEMU Inter-VM shared memory device (ivshmem) depends on eventfd and will only be built on FreeBSD versions > 12. The fix is picked up from the QEMU port. Approved by: bapt (implicit) --- sysutils/edk2/Makefile | 1 - sysutils/edk2/distinfo | 2 -- sysutils/xen-tools/Makefile | 6 ++++++ sysutils/xen-tools/pkg-plist | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index 5a7e41f8e1ac..f63ffd7f3cf7 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -33,7 +33,6 @@ GH_TUPLE= tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \ ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \ google:brotli:v1.0.7-17-g666c328:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \ - akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson BINARY_ALIAS= make=${LOCALBASE}/bin/gmake \ dtc=${LOCALBASE}/bin/dtc \ diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo index 170b62c9d0eb..5b9797ac2b1a 100644 --- a/sysutils/edk2/distinfo +++ b/sysutils/edk2/distinfo @@ -13,5 +13,3 @@ SHA256 (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 7f7576c926f7d4a071d594a01691c4 SIZE (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 592141 SHA256 (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = caed254751585590b20b4a34d6600e9c9aae153ab1f9e1ae6b67f9bc3ee09b92 SIZE (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = 23854268 -SHA256 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0 -SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979 diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile index ce37661a08ab..f73eb12cfae7 100644 --- a/sysutils/xen-tools/Makefile +++ b/sysutils/xen-tools/Makefile @@ -58,6 +58,12 @@ DOCS_ALL_TARGET= docs INSTALL_TARGET= install-tools DOCS_INSTALL_TARGET= install-docs +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300000 +PLIST_SUB+= IVSHMEM="" +.else +PLIST_SUB+= IVSHMEM="@comment " +.endif + .include .if ${OPSYS} != FreeBSD diff --git a/sysutils/xen-tools/pkg-plist b/sysutils/xen-tools/pkg-plist index b932ed40679e..2288a58ae2fc 100644 --- a/sysutils/xen-tools/pkg-plist +++ b/sysutils/xen-tools/pkg-plist @@ -236,8 +236,8 @@ lib/libxlutil.so.4.15.0 %%PYTHON_SITELIBDIR%%/xenfsimage%%PYTHON_EXT_SUFFIX%%.so lib/xen/bin/convert-legacy-stream lib/xen/bin/depriv-fd-checker -lib/xen/bin/ivshmem-client -lib/xen/bin/ivshmem-server +%%IVSHMEM%%lib/xen/bin/ivshmem-client +%%IVSHMEM%%lib/xen/bin/ivshmem-server lib/xen/bin/libxl-save-helper lib/xen/bin/lsevtchn lib/xen/bin/pygrub