From 748125eea8b5403d2b12373a0781156e8b2381d9 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 11 Oct 2024 22:46:16 +0800 Subject: [PATCH] [nsync] update to 1.29.2 (#41387) --- ports/nsync/export-targets.patch | 36 -------------------------------- ports/nsync/fix-install.patch | 28 ++++++++++++------------- ports/nsync/portfile.cmake | 9 ++++---- ports/nsync/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nsync.json | 5 +++++ 6 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 ports/nsync/export-targets.patch diff --git a/ports/nsync/export-targets.patch b/ports/nsync/export-targets.patch deleted file mode 100644 index cbae3d366b..0000000000 --- a/ports/nsync/export-targets.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 328f9b6..6a71b5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,9 @@ function (set_cpp_target tgtname files) - "${PROJECT_SOURCE_DIR}/platform/c++11.futex" - ) - endif () -+ -+ target_include_directories("${tgtname}" PUBLIC $) -+ - - target_compile_definitions ("${tgtname}" PRIVATE "${NSYNC_CPP_DEFINITIONS}") - -@@ -399,14 +402,19 @@ endif () - # By default, install nsync always - # set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) - --install (TARGETS nsync -+install (TARGETS nsync EXPORT unofficial-nsyncConfig - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) - --install (TARGETS nsync_cpp OPTIONAL -+install (TARGETS nsync_cpp OPTIONAL EXPORT unofficial-nsyncConfig - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) - -+install(EXPORT unofficial-nsyncConfig -+ NAMESPACE unofficial::nsync:: -+ DESTINATION share/unofficial-nsync -+) -+ - set (NSYNC_INCLUDES - "public/nsync.h" - "public/nsync_atomic.h" diff --git a/ports/nsync/fix-install.patch b/ports/nsync/fix-install.patch index efe560d15b..3d7917defb 100644 --- a/ports/nsync/fix-install.patch +++ b/ports/nsync/fix-install.patch @@ -1,9 +1,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6b1f1dc..328f9b6 100644 +index fcc3f41..18859e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -80,7 +80,7 @@ set (NSYNC_OS_CPP_SRC - # https://cmake.org/cmake/help/v3.1/policy/CMP0054.html +@@ -41,6 +41,9 @@ function (set_cpp_target tgtname files) + "${PROJECT_SOURCE_DIR}/platform/c++11.futex" + ) + endif () ++ ++ target_include_directories("${tgtname}" PUBLIC $) ++ + + target_compile_definitions ("${tgtname}" PRIVATE "${NSYNC_CPP_DEFINITIONS}") + +@@ -88,7 +91,7 @@ if ("${CMAKE_C_COMPILER_ID}X" STREQUAL "MSVCX") + endif () # Pick the include directory for the operating system. -if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") @@ -11,7 +21,7 @@ index 6b1f1dc..328f9b6 100644 include_directories ("${PROJECT_SOURCE_DIR}/platform/win32") set (NSYNC_CPP_FLAGS "/TP") -@@ -230,7 +230,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X")) +@@ -232,7 +235,7 @@ elseif (("${CMAKE_SYSTEM_PROCESSOR}X" STREQUAL "ppc64X")) endif () # Windows uses some include files from the posix directory also. @@ -20,13 +30,3 @@ index 6b1f1dc..328f9b6 100644 include_directories ("${PROJECT_SOURCE_DIR}/platform/posix") endif () -@@ -396,7 +396,8 @@ if (NSYNC_ENABLE_TESTS) - endforeach (t) - endif () - --set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) -+# By default, install nsync always -+# set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) - - install (TARGETS nsync - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries diff --git a/ports/nsync/portfile.cmake b/ports/nsync/portfile.cmake index d927e63081..60c2c0d5e1 100644 --- a/ports/nsync/portfile.cmake +++ b/ports/nsync/portfile.cmake @@ -6,11 +6,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/nsync REF "${VERSION}" - SHA512 8aa49997f100f161f0f32e99c9004ee845d7b16c1391e7eb62eea0897e2f91b7f9e5181055fdca637518751b6b26e16a1cd53e45adceda145285752c4b74f3bf + SHA512 af463d768c9e4bacc5796410c6d368b8ad0cc0fcbae28ec35fbe7937e7939de1ccad97f51b4940e384b677bb8fbc9963a438f7687e002613f1669ab93e459f60 HEAD_REF master PATCHES fix-install.patch - export-targets.patch ) vcpkg_cmake_configure( @@ -18,10 +17,12 @@ vcpkg_cmake_configure( OPTIONS -DNSYNC_ENABLE_TESTS=OFF ) +vcpkg_cmake_build() vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nsync_cpp PACKAGE_NAME nsync_cpp DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nsync) vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nsync CONFIG_PATH share/unofficial-nsync) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nsync/vcpkg.json b/ports/nsync/vcpkg.json index 2ec424eec2..d562db0210 100644 --- a/ports/nsync/vcpkg.json +++ b/ports/nsync/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nsync", - "version": "1.26.0", + "version": "1.29.2", "description": "nsync is a C library that exports various synchronization primitives, such as mutexes", "homepage": "https://github.com/google/nsync", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4854b78a38..57180133bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6373,7 +6373,7 @@ "port-version": 1 }, "nsync": { - "baseline": "1.26.0", + "baseline": "1.29.2", "port-version": 0 }, "nt-wrapper": { diff --git a/versions/n-/nsync.json b/versions/n-/nsync.json index 810d7003e0..5d05ee1615 100644 --- a/versions/n-/nsync.json +++ b/versions/n-/nsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04b2d31e465f427424f48323cec0c1f2aa51cbc8", + "version": "1.29.2", + "port-version": 0 + }, { "git-tree": "2861341c0435829734827dc84d7166d95d8e8bee", "version": "1.26.0",