From 8e41b036b7b203eaff60c133dede5a6d70c28a6e Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Tue, 25 Jul 2023 01:48:09 -0700 Subject: [PATCH 1/2] [sleef] Disable COMPILER_SUPPORTS_OPENMP on Linux --- ports/sleef/portfile.cmake | 7 ++++++- ports/sleef/vcpkg.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake index e51e0374f9c282..4d2613c56d1611 100644 --- a/ports/sleef/portfile.cmake +++ b/ports/sleef/portfile.cmake @@ -6,6 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +if(VCPKG_TARGET_IS_LINUX) + set(openmp_options -DCOMPILER_SUPPORTS_OPENMP=FALSE) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -15,13 +19,14 @@ vcpkg_cmake_configure( -DBUILD_GNUABI_LIBS=${VCPKG_TARGET_IS_LINUX} -DBUILD_TESTS=OFF -DBUILD_INLINE_HEADERS=OFF + ${openmp_options} ) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") # Install DLL and PDB files if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json index 60b71ed05f49e0..5e6c79973c5b53 100644 --- a/ports/sleef/vcpkg.json +++ b/ports/sleef/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sleef", "version": "3.5.1", - "port-version": 4, + "port-version": 5, "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", "homepage": "https://sleef.org/", "license": "BSL-1.0", From 5509478ffd967dc2424e12c872957c35088ba675 Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Tue, 25 Jul 2023 01:52:11 -0700 Subject: [PATCH 2/2] update version --- versions/baseline.json | 2 +- versions/s-/sleef.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index c1d1cdd61e5307..58e33448092e2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7586,7 +7586,7 @@ }, "sleef": { "baseline": "3.5.1", - "port-version": 4 + "port-version": 5 }, "sleepy-discord": { "baseline": "2022-02-05", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index b404bed22d9910..06ea76ed765656 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be92d22b599c37d9003d6e15f160dfd74b6f0648", + "version": "3.5.1", + "port-version": 5 + }, { "git-tree": "12afaa5146f51bf2912339befaafd1776e10442a", "version": "3.5.1",