From 2abab10a08b31718c0b10b58d0cf5ae3ce4b5b5c Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 13 Dec 2021 23:23:30 +0300 Subject: [PATCH] [libuuid] Fix wrong pkg-config installation (#21970) (#21972) * [libuuid] Fix wrong pkg-config installation (#21970) * update port version * Update version database --- ports/libuuid/portfile.cmake | 8 ++++++-- ports/libuuid/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libuuid.json | 5 +++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake index 3e29431f4b..e989ce53fe 100644 --- a/ports/libuuid/portfile.cmake +++ b/ports/libuuid/portfile.cmake @@ -28,8 +28,12 @@ set(exec_prefix \$\{prefix\}) set(libdir \$\{exec_prefix\}/lib) set(includedir \$\{prefix\}/include) configure_file(${SOURCE_PATH}/uuid.pc.in ${SOURCE_PATH}/uuid.pc @ONLY) -file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-libuuid TARGET_PATH share/unofficial-libuuid) vcpkg_fixup_pkgconfig() diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json index 0f88cf666f..ef05a235e6 100644 --- a/ports/libuuid/vcpkg.json +++ b/ports/libuuid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libuuid", "version": "1.0.3", - "port-version": 8, + "port-version": 9, "description": "Universally unique id library", "homepage": "https://sourceforge.net/projects/libuuid", "supports": "linux | osx" diff --git a/versions/baseline.json b/versions/baseline.json index 05a284d0e3..e3c406ad4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4026,7 +4026,7 @@ }, "libuuid": { "baseline": "1.0.3", - "port-version": 8 + "port-version": 9 }, "libuv": { "baseline": "1.42.0", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index a927d01b3e..0fdb748ec6 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321", + "version": "1.0.3", + "port-version": 9 + }, { "git-tree": "4058a76786f399c80e1973a4101e8291032b3e9b", "version": "1.0.3",