From 7da66f2058527c51ca6a69238a1328a674145eb6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 6 May 2024 21:49:39 +0200 Subject: [PATCH] [libsystemd] Control dependencies (#38541) Fixes cross-builds, https://github.com/microsoft/vcpkg/issues/38094#issuecomment-2091528489. --- ports/libsystemd/portfile.cmake | 39 +++++++++++++++++++++++++++++++-- ports/libsystemd/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsystemd.json | 5 +++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/ports/libsystemd/portfile.cmake b/ports/libsystemd/portfile.cmake index d4bcb53e98..0266c5acd1 100644 --- a/ports/libsystemd/portfile.cmake +++ b/ports/libsystemd/portfile.cmake @@ -20,10 +20,45 @@ vcpkg_configure_meson( -Dmode=release -Dstatic-libsystemd=${static} -Dtests=false - # dependencies + # disabled capabilites -Ddns-over-tls=false - -Dlz4=enabled -Dtranslations=false + # disabled dependencies + -Dacl=disabled + -Dapparmor=disabled + -Daudit=disabled + -Dblkid=disabled + -Dbpf-framework=disabled + -Dbzip2=disabled + -Ddbus=disabled # tests only + -Delfutils=disabled + -Dfdisk=disabled + -Dgcrypt=disabled + -Dglib=disabled # tests only + -Dgnutls=disabled + -Dkmod=disabled + -Dlibcurl=disabled + -Dlibcryptsetup=disabled + -Dlibfido2=disabled + -Dlibidn=disabled + -Dlibidn2=disabled + -Dlibiptc=disabled + -Dmicrohttpd=disabled + -Dopenssl=disabled + -Dp11kit=disabled + -Dpam=disabled + -Dpcre2=disabled + -Dpolkit=disabled + -Dpwquality=disabled + -Dpasswdqc=disabled + -Dseccomp=disabled + -Dselinux=disabled + -Dtpm2=disabled + -Dxenctrl=disabled + -Dxkbcommon=disabled + -Dzlib=disabled + # enabled dependencies + -Dlz4=enabled -Dxz=enabled -Dzstd=enabled ADDITIONAL_BINARIES diff --git a/ports/libsystemd/vcpkg.json b/ports/libsystemd/vcpkg.json index 23a2cb9dbf..d151c51256 100644 --- a/ports/libsystemd/vcpkg.json +++ b/ports/libsystemd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsystemd", "version": "255", - "port-version": 1, + "port-version": 2, "description": "Libsystemd", "homepage": "https://github.com/systemd/systemd", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 65578206ca..2bdf9134a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5018,7 +5018,7 @@ }, "libsystemd": { "baseline": "255", - "port-version": 1 + "port-version": 2 }, "libtar": { "baseline": "1.2.20", diff --git a/versions/l-/libsystemd.json b/versions/l-/libsystemd.json index 660ac78e01..df78d5ee1d 100644 --- a/versions/l-/libsystemd.json +++ b/versions/l-/libsystemd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c173e2a6eaa6e20dae0122c0aee9ab9cfab82df", + "version": "255", + "port-version": 2 + }, { "git-tree": "a69dc63dcb8666fd4fb3885193dc67889fe65c72", "version": "255",