Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[sleef] Update, fix exported link libs (#47147)

Browse Source 
Co-authored-by: JoergAtGithub <JoergAtGithub@worldwartweb.com>
This commit is contained in:
Kai Pastor
2025-09-08 08:39:56 +02:00
committed by GitHub
parent 4a7ce81d91
commit cfa61a685a
13 changed files with 246 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/rubberband/portfile.cmake
View File

@@ -16,7 +16,7 @@ endif()
# Select fastest available FFT library according https://github.com/breakfastquay/rubberband/blob/default/COMPILING.md#fft-libraries-supported
if(
(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
OR (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
OR VCPKG_TARGET_IS_OSX
OR VCPKG_TARGET_IS_IOS
OR VCPKG_TARGET_IS_EMSCRIPTEN
)

8
ports/rubberband/vcpkg.json
View File

@@ -1,6 +1,7 @@
{
"name": "rubberband",
"version": "4.0.0",
"port-version": 1,
"description": "A high quality software library for audio time-stretching and pitch-shifting.",
"homepage": "https://www.breakfastquay.com/rubberband/",
"license": "GPL-2.0-or-later",
@@ -8,12 +9,15 @@
"dependencies": [
{
"name": "fftw3",
"platform": "(arm & windows) | (x86 & windows) | (arm64 & osx) | ios | emscripten"
"platform": "(arm & windows) | (x86 & windows) | ios | osx | emscripten"
},
"libsamplerate",
{
"name": "sleef",
"platform": "!(arm & windows) & !(x86 & windows) & !(arm64 & osx) & !ios & !emscripten"
"features": [
"dft"
],
"platform": "!(arm & windows) & !(x86 & windows) & !ios & !osx & !emscripten"
},
{
"name": "vcpkg-tool-meson",

20
ports/sleef/0001-Add-missing-exe-suffix-for-host-executables.patch
View File

@@ -1,20 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f4f3e8..039e6fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,7 +320,11 @@ function(add_host_executable TARGETNAME)
endif()
else()
add_executable(${TARGETNAME} IMPORTED GLOBAL)
- set_property(TARGET ${TARGETNAME} PROPERTY IMPORTED_LOCATION ${NATIVE_BUILD_DIR}/bin/${TARGETNAME})
+ if(CMAKE_HOST_WIN32)
+ set_property(TARGET ${TARGETNAME} PROPERTY IMPORTED_LOCATION ${NATIVE_BUILD_DIR}/bin/${TARGETNAME}.exe)
+ else()
+ set_property(TARGET ${TARGETNAME} PROPERTY IMPORTED_LOCATION ${NATIVE_BUILD_DIR}/bin/${TARGETNAME})
+ endif()
endif()
endfunction()
--
2.34.1

28
ports/sleef/android-neon.diff Normal file
View File

@@ -0,0 +1,28 @@
diff --git a/Configure.cmake b/Configure.cmake
index c7b5023..178ea44 100644
--- a/Configure.cmake
+++ b/Configure.cmake
@@ -253,6 +253,9 @@ set(CLANG_FLAGS_ENABLE_AVX2128 "-mavx2;-mfma")
set(CLANG_FLAGS_ENABLE_AVX512F "-mavx512f")
set(CLANG_FLAGS_ENABLE_AVX512FNOFMA "-mavx512f")
set(CLANG_FLAGS_ENABLE_NEON32 "--target=arm-linux-gnueabihf;-mcpu=cortex-a8")
+if(ANDROID)
+ list(FILTER CLANG_FLAGS_ENABLE_NEON32 EXCLUDE REGEX "^--target")
+endif()
set(CLANG_FLAGS_ENABLE_NEON32VFPV4 "-march=armv7-a;-mfpu=neon-vfpv4")
# Arm AArch64 vector extensions.
set(CLANG_FLAGS_ENABLE_SVE "-march=armv8-a+sve")
diff --git a/src/dft/CMakeLists.txt b/src/dft/CMakeLists.txt
index 526c4f8..d57c3b8 100644
--- a/src/dft/CMakeLists.txt
+++ b/src/dft/CMakeLists.txt
@@ -173,7 +173,9 @@ if (COMPILER_SUPPORTS_SVE)
endif(COMPILER_SUPPORTS_SVE)
if (COMPILER_SUPPORTS_NEON32)
+ if(FORCE_NEON32)
set(ISALIST_SP ${ISALIST_SP} neon32sp)
+ endif()
endif(COMPILER_SUPPORTS_NEON32)
if (COMPILER_SUPPORTS_RVVM1)

10
ports/sleef/exclude-testerutil.diff Normal file
View File

@@ -0,0 +1,10 @@
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 6a1cda3..cdec16c 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -62,3 +62,5 @@ if(COMPILER_SUPPORTS_QUADMATH)
target_link_libraries(${TARGET_QTESTERUTIL_OBJ} "-lquadmath")
target_compile_definitions(${TARGET_QTESTERUTIL_OBJ} PRIVATE ENABLEFLOAT128=1)
endif()
+
+set_target_properties(${TARGET_TESTERUTIL_OBJ} ${TARGET_QTESTERUTIL_OBJ} PROPERTIES EXCLUDE_FROM_ALL 1)

99
ports/sleef/export-link-libs.diff Normal file
View File

@@ -0,0 +1,99 @@
diff --git a/Configure.cmake b/Configure.cmake
index e23f577..c7b5023 100644
--- a/Configure.cmake
+++ b/Configure.cmake
@@ -55,9 +55,15 @@ endif()
find_library(LIB_MPFR mpfr)
if(SLEEF_BUILD_WITH_LIBM)
find_library(LIBM m)
+ if(LIBM)
+ set(LIBM "m" CACHE INTERNAL "")
+ endif()
endif()
find_library(LIBGMP gmp)
find_library(LIBRT rt)
+if(LIBRT)
+ set(LIBRT "rt" CACHE INTERNAL "")
+endif()
find_library(LIBFFTW3 fftw3)
find_library(LIBFFTW3F fftw3f)
diff --git a/sleefConfig.cmake b/sleefConfig.cmake
index 6e423f2..4d415ab 100644
--- a/sleefConfig.cmake
+++ b/sleefConfig.cmake
@@ -1 +1,5 @@
+if("@COMPILER_SUPPORTS_OPENMP@")
+ include(CMakeFindDependencyMacro)
+ find_dependency(OpenMP)
+endif()
include("${CMAKE_CURRENT_LIST_DIR}/sleefTargets.cmake")
diff --git a/src/dft/CMakeLists.txt b/src/dft/CMakeLists.txt
index 15bee24..526c4f8 100644
--- a/src/dft/CMakeLists.txt
+++ b/src/dft/CMakeLists.txt
@@ -216,8 +216,8 @@ endif()
# Compiler properties
-set(CMAKE_C_FLAGS "${ORG_CMAKE_C_FLAGS} ${DFT_C_FLAGS} ${OpenMP_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "${ORG_CMAKE_C_FLAGS} ${DFT_C_FLAGS} ${OpenMP_C_FLAGS}")
+set(CMAKE_C_FLAGS "${ORG_CMAKE_C_FLAGS} ${DFT_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${ORG_CMAKE_C_FLAGS} ${DFT_C_FLAGS}")
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
@@ -414,7 +414,7 @@ endforeach()
# Target libdft
add_library(${TARGET_LIBDFT} $<TARGET_OBJECTS:dftcommon_obj> $<TARGET_OBJECTS:dft_obj> ${UNROLL_OBJECTS})
-target_link_libraries(${TARGET_LIBDFT} ${TARGET_LIBSLEEF} ${LIBM})
+target_link_libraries(${TARGET_LIBDFT} PRIVATE ${TARGET_LIBSLEEF} OpenMP::OpenMP_C ${LIBM})
set_target_properties(${TARGET_LIBDFT} PROPERTIES
VERSION ${SLEEF_VERSION}
diff --git a/src/libm/CMakeLists.txt b/src/libm/CMakeLists.txt
index 8969ba2..25aef5b 100644
--- a/src/libm/CMakeLists.txt
+++ b/src/libm/CMakeLists.txt
@@ -682,7 +682,8 @@ endif(SLEEF_BUILD_INLINE_HEADERS)
# use some of the math functions used in the scalar code (for example
# sqrt).
if(LIBM AND NOT COMPILER_SUPPORTS_BUILTIN_MATH)
- target_link_libraries(${TARGET_LIBSLEEF} ${LIBM})
+ target_link_libraries(${TARGET_LIBSLEEF} PRIVATE ${LIBM})
+ string(APPEND PC_LIBS_PRIVATE " -lm")
endif()
target_sources(${TARGET_LIBSLEEF} PRIVATE $<TARGET_OBJECTS:${TARGET_LIBCOMMON_OBJ}>)
@@ -907,7 +908,7 @@ if(ENABLE_GNUABI)
# libm to use some of the math functions used in the scalar code (for
# example sqrt).
if(LIBM AND NOT COMPILER_SUPPORTS_BUILTIN_MATH)
- target_link_libraries(${TARGET_LIBSLEEFGNUABI} ${LIBM})
+ target_link_libraries(${TARGET_LIBSLEEFGNUABI} PRIVATE ${LIBM})
endif()
endif(ENABLE_GNUABI)
diff --git a/src/libm/sleef.pc.in b/src/libm/sleef.pc.in
index f73bc14..b36ccad 100644
--- a/src/libm/sleef.pc.in
+++ b/src/libm/sleef.pc.in
@@ -7,3 +7,4 @@ Description: SIMD Library for Evaluating Elementary Functions, vectorized libm a
Version: @SLEEF_VERSION_MAJOR@.@SLEEF_VERSION_MINOR@.@SLEEF_VERSION_PATCH@
Cflags: -I${includedir}
Libs: -L${libdir} -lsleef
+Libs.private: @PC_LIBS_PRIVATE@
diff --git a/src/quad/CMakeLists.txt b/src/quad/CMakeLists.txt
index 8e4e261..cda4799 100644
--- a/src/quad/CMakeLists.txt
+++ b/src/quad/CMakeLists.txt
@@ -226,7 +226,7 @@ set_target_properties(sleefquad PROPERTIES
set_target_properties(sleefquad PROPERTIES ${COMMON_TARGET_PROPERTIES})
if(LIBM AND ((NOT COMPILER_SUPPORTS_BUILTIN_MATH) OR (SLEEF_ARCH_32BIT AND SLEEF_ARCH_X86)))
- target_link_libraries(sleefquad ${LIBM})
+ target_link_libraries(sleefquad PRIVATE ${LIBM})
endif()
# --------------------------------------------------------------------

37
ports/sleef/portfile.cmake
View File

@@ -2,40 +2,57 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO shibatch/sleef
REF ${VERSION}
SHA512 218b4e7e2eeb1f9b45e56c2fbb46062480480c55f49b6b0d138d910374e7791c7dd909b964fbf9e2e984a896a3b162eb5aabaaa770692e1db440627e7ad07945
SHA512 9b47667b33a685308aa65f848b7ee620e9e8783ca4851fd57e873f34310b486fb351813f573f2a7a71b6bdc5c8b2c5ef4eb4f66c890ddfbfada7bb9d74626c0b
HEAD_REF master
PATCHES
0001-Add-missing-exe-suffix-for-host-executables.patch
android-neon.diff
exclude-testerutil.diff
export-link-libs.diff
sleefdft.pc.diff
)
vcpkg_check_features(OUT_FEATURE_OPTIONS options
FEATURES
dft SLEEF_BUILD_DFT
dft SLEEF_ENFORCE_DFT
)
set(CROSSCOMP_OPTIONS "")
if(VCPKG_CROSSCOMPILING)
set(CROSSCOMP_OPTIONS "-DNATIVE_BUILD_DIR=${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
list(APPEND options "-DNATIVE_BUILD_DIR=${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${options}
-DSLEEF_BUILD_LIBM=ON
-DSLEEF_BUILD_DFT=ON
-DSLEEF_BUILD_QUAD=ON
-DSLEEF_BUILD_GNUABI_LIBS=${VCPKG_TARGET_IS_LINUX}
-DSLEEF_BUILD_TESTS=OFF
${CROSSCOMP_OPTIONS}
-DSLEEF_DISABLE_SSL=ON
-DSLEEF_DISABLE_SVE=ON # arm64 build issues, officially unmaintained
-DSLEEF_ENABLE_TLFLOAT=OFF
-DSLEEF_ENABLE_TESTER4=OFF
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleef)
vcpkg_fixup_pkgconfig()
if(NOT VCPKG_CROSSCOMPILING)
set(tools mkrename qmkrename mkalias mkdisp qmkdisp)
if("dft" IN_LIST FEATURES)
list(APPEND tools mkdispatch mkunroll)
endif()
vcpkg_copy_tools(
TOOL_NAMES mkrename qmkrename mkalias mkdispatch mkdisp qmkdisp mkunroll
TOOL_NAMES ${tools}
SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin"
DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}/bin"
AUTO_CLEAN)
endif()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleef)
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")

45
ports/sleef/sleefdft.pc.diff Normal file
View File

@@ -0,0 +1,45 @@
diff --git a/src/dft/CMakeLists.txt b/src/dft/CMakeLists.txt
index 526c4f8..667a7c2 100644
--- a/src/dft/CMakeLists.txt
+++ b/src/dft/CMakeLists.txt
@@ -443,3 +443,22 @@ install(
INCLUDES #
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
)
+
+set(items "")
+foreach(lib IN LISTS OpenMP_CXX_LIB_NAMES OpenMP_C_LIB_NAMES)
+ list(REMOVE_ITEM items " -l${lib}")
+ list(APPEND items " -l${lib}")
+endforeach()
+string(APPEND PC_LIBS_PRIVATE ${items})
+set(items "")
+foreach(flag IN LISTS OpenMP_CXX_FLAGS OpenMP_C_FLAGS)
+ list(REMOVE_ITEM items " ${flag}")
+ list(APPEND items " ${flag}")
+endforeach()
+string(APPEND PC_CFLAGS_PRIVATE ${items})
+configure_file("sleefdft.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sleefdft.pc" @ONLY)
+install(
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/sleefdft.pc"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+ COMPONENT sleef_Development
+)
diff --git a/src/dft/sleefdft.pc.in b/src/dft/sleefdft.pc.in
new file mode 100644
index 0000000..58b6e2a
--- /dev/null
+++ b/src/dft/sleefdft.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+Name: SLEEFDFT
+Description: SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT
+Version: @SLEEF_VERSION_MAJOR@.@SLEEF_VERSION_MINOR@.@SLEEF_VERSION_PATCH@
+Cflags: -I${includedir}
+Cflags.private: @PC_CFLAGS_PRIVATE@
+Libs: -L${libdir} -lsleefdft
+Libs.private: @PC_LIBS_PRIVATE@
+Requires.private: sleef

19
ports/sleef/vcpkg.json
View File

@@ -1,7 +1,6 @@
{
"name": "sleef",
"version": "3.8",
"port-version": 1,
"version": "3.9.0",
"description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT",
"homepage": "https://sleef.org/",
"license": "BSL-1.0",
@@ -19,5 +18,19 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"features": {
"dft": {
"description": "Build the DFT library. Needs OpenMP.",
"dependencies": [
{
"name": "sleef",
"host": true,
"features": [
"dft"
]
}
]
}
}
}

2
scripts/ci.feature.baseline.txt
View File

@@ -2195,9 +2195,9 @@ qtmultimedia[core,ffmpeg,gstreamer,qml,widgets](osx) = combination-fails # Error
qtmultimedia[gstreamer]:x64-linux=no-separate-feature-test
realsense2:arm64-windows = fail # fw-update-device.h(1): warning C4828: The file contains a character starting at offset 0x4c3 that is illegal in the current source character set (codepage 65001). See https://github.com/microsoft/vcpkg/issues/35628
rtabmap[openmp](osx) = feature-fails # No openmp on default osx toolchain
rubberband[cli](linux) = feature-fails # See https://github.com/microsoft/vcpkg/issues/32360
saucer(linux) = fail # requires gcc14 or later
saucer(osx) = fail # std::move_only_function is not supported
sleef[dft](osx) = feature-fails # openmp setup needed
sqlite-orm[test](uwp) = feature-fails # error LNK2019: unresolved external symbol main referenced in function "int __cdecl invoke_main(void)". See https://github.com/microsoft/vcpkg/issues/33769
sqlpp11[core,mariadb,mysql] = options # can not select mariadb and mysql at the same time
sqlpp11-connector-mysql[core,mariadb,mysql] = options # can not select mariadb and mysql at the same time

6
versions/baseline.json
View File

@@ -8538,7 +8538,7 @@
},
"rubberband": {
"baseline": "4.0.0",
"port-version": 0
"port-version": 1
},
"ruckig": {
"baseline": "0.15.3",
@@ -8929,8 +8929,8 @@
"port-version": 2
},
"sleef": {
"baseline": "3.8",
"port-version": 1
"baseline": "3.9.0",
"port-version": 0
},
"sleepy-discord": {
"baseline": "2025-02-08",

5
versions/r-/rubberband.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7d948232485cc496cf6c92b9f09a2274a208db03",
"version": "4.0.0",
"port-version": 1
},
{
"git-tree": "6809f417332532735fe4b2b92ec5c5902077017c",
"version": "4.0.0",

5
versions/s-/sleef.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "afcb099ce882dcb1b316af9efa306b6d9ec3ba69",
"version": "3.9.0",
"port-version": 0
},
{
"git-tree": "2cdaa4e9420352cd81759a054a7a19ec1200b336",
"version": "3.8",