From efca044b75fbf481d6650ce4d3b223d8af94f7a7 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 12 Jul 2023 02:41:53 +0800 Subject: [PATCH] fix conflict file with libevent (#32471) --- ports/libev/portfile.cmake | 10 +++++----- ports/libev/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libev.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/libev/portfile.cmake b/ports/libev/portfile.cmake index edbe54408d..a12364e66f 100644 --- a/ports/libev/portfile.cmake +++ b/ports/libev/portfile.cmake @@ -18,10 +18,10 @@ vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file( - INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright -) +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libevConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libev/vcpkg.json b/ports/libev/vcpkg.json index 4ea0372e81..73d16f0f11 100644 --- a/ports/libev/vcpkg.json +++ b/ports/libev/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libev", "version": "4.33", + "port-version": 1, "description": "libev is a high-performance event loop/event model with lots of features.", "homepage": "http://software.schmorp.de/pkg/libev.html", "license": "BSD-2-Clause OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 918df79435..450a6fc35f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4030,7 +4030,7 @@ }, "libev": { "baseline": "4.33", - "port-version": 0 + "port-version": 1 }, "libevent": { "baseline": "2.1.12+20230128", diff --git a/versions/l-/libev.json b/versions/l-/libev.json index de71987e96..1c9132ba0c 100644 --- a/versions/l-/libev.json +++ b/versions/l-/libev.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfde981a39ab06f99274a246ccbb342b51efe55f", + "version": "4.33", + "port-version": 1 + }, { "git-tree": "8602cc86e0ede2c2f32fb03b1e2bfd0698331bf3", "version": "4.33",