Skip to content

Commit

Permalink
sysutils/xen-tools: fix build on FreeBSD 12
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
Roger Pau Monné authored and Roger Pau Monné committed May 20, 2021
1 parent ef0c9c2 commit 97632df
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
1 change: 0 additions & 1 deletion sysutils/edk2/Makefile
Expand Up @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions sysutils/edk2/distinfo
Expand Up @@ -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
6 changes: 6 additions & 0 deletions sysutils/xen-tools/Makefile
Expand Up @@ -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 <bsd.port.options.mk>

.if ${OPSYS} != FreeBSD
Expand Down
4 changes: 2 additions & 2 deletions sysutils/xen-tools/pkg-plist
Expand Up @@ -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
Expand Down

0 comments on commit 97632df

Please sign in to comment.