From d0c6b82eaf2bf3ecb4d38921f3cd1bd3e1db6da5 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 19 Dec 2023 00:28:40 +0300 Subject: [PATCH] Remove custom libsystemd vcpkg port that was updated on upstream Signed-off-by: Vitalii Koshura --- .../ports/libsystemd/pkgconfig.patch | 11 ---- .../ports/libsystemd/portfile.cmake | 60 ------------------- .../vcpkg_ports/ports/libsystemd/vcpkg.json | 25 -------- 3 files changed, 96 deletions(-) delete mode 100644 3rdParty/vcpkg_ports/ports/libsystemd/pkgconfig.patch delete mode 100644 3rdParty/vcpkg_ports/ports/libsystemd/portfile.cmake delete mode 100644 3rdParty/vcpkg_ports/ports/libsystemd/vcpkg.json diff --git a/3rdParty/vcpkg_ports/ports/libsystemd/pkgconfig.patch b/3rdParty/vcpkg_ports/ports/libsystemd/pkgconfig.patch deleted file mode 100644 index 1c6f5dee355..00000000000 --- a/3rdParty/vcpkg_ports/ports/libsystemd/pkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in -index da6e4e667e..3786238ccb 100644 ---- a/src/libsystemd/libsystemd.pc.in -+++ b/src/libsystemd/libsystemd.pc.in -@@ -17,4 +17,6 @@ Description: systemd Library - URL: {{PROJECT_URL}} - Version: {{PROJECT_VERSION}} - Libs: -L${libdir} -lsystemd -+Libs.private: -lrt -+Requires.private: libcap libcrypt liblz4 liblzma libzstd mount - Cflags: -I${includedir} diff --git a/3rdParty/vcpkg_ports/ports/libsystemd/portfile.cmake b/3rdParty/vcpkg_ports/ports/libsystemd/portfile.cmake deleted file mode 100644 index 2db5d2866d8..00000000000 --- a/3rdParty/vcpkg_ports/ports/libsystemd/portfile.cmake +++ /dev/null @@ -1,60 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO systemd/systemd - REF "v${VERSION}" - SHA512 84b4d16980fe2e64d5c3c95b9b4fbaad1076f368f493fdd745cbafbe7ce825293384f5fa0b6360ba8188da23c4575e87402fb666a3b71f84ff8b323aba0c07ff - PATCHES - pkgconfig.patch -) - -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") - -vcpkg_configure_meson( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -Dstatic-libsystemd=true - -Daudit=false - -Dgcrypt=false - OPTIONS_DEBUG - -Drootprefix=${CURRENT_PACKAGES_DIR}/debug - -Dpkgconfiglibdir={CURRENT_PACKAGES_DIR}/debug - OPTIONS_RELEASE - -Drootprefix=${CURRENT_PACKAGES_DIR} - -Dpkgconfiglibdir={CURRENT_PACKAGES_DIR} -) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_build_ninja( - TARGETS libsystemd.a devel - ) -else() - vcpkg_build_ninja( - TARGETS libsystemd devel - ) -endif() - -file(INSTALL "${SOURCE_PATH}/src/systemd" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") - -set(BUILD_DIR_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -else() - file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FOLLOW_SYMLINK_CHAIN) -endif() - -if(NOT VCPKG_BUILD_TYPE) - set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - else() - file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN) - endif() -endif() - -file(INSTALL "${BUILD_DIR_RELEASE}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -if(NOT VCPKG_BUILD_TYPE) - file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -endif() - -vcpkg_fixup_pkgconfig() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.LGPL2.1") diff --git a/3rdParty/vcpkg_ports/ports/libsystemd/vcpkg.json b/3rdParty/vcpkg_ports/ports/libsystemd/vcpkg.json deleted file mode 100644 index 71bd3765593..00000000000 --- a/3rdParty/vcpkg_ports/ports/libsystemd/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "libsystemd", - "version": "254", - "port-version": 2, - "description": "Libsystemd", - "homepage": "https://github.com/systemd/systemd", - "license": "LGPL-2.1+", - "supports": "linux", - "dependencies": [ - { - "name": "gperf", - "host": true - }, - "libcap", - "liblzma", - "libmount", - "libxcrypt", - "lz4", - { - "name": "vcpkg-tool-meson", - "host": true - }, - "zstd" - ] -}