[stxxl] Cleanup, enable dynamic linkage on !windows (#42700)

This commit is contained in:
Kai Pastor 2024-12-16 17:08:55 +01:00 committed by GitHub
parent 00bd5c4aa5
commit 6936437e11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 40 deletions

View File

@ -1,4 +1,6 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -12,10 +14,13 @@ vcpkg_from_github(
0001-fix-visual-studio.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_STATIC_LIBS=ON
-DINSTALL_CMAKE_DIR:STRING=share/${PORT}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
-DBUILD_EXTRAS=OFF
@ -34,41 +39,15 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup()
if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}")
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
endif()
vcpkg_replace_string(
"${CURRENT_PACKAGES_DIR}/share/${PORT}/stxxl-config.cmake"
"\${STXXL_CMAKE_DIR}/../include"
"\${STXXL_CMAKE_DIR}/../../include"
IGNORE_UNCHANGED
)
if(CMAKE_HOST_WIN32)
set(EXECUTABLE_SUFFIX ".exe")
else()
set(EXECUTABLE_SUFFIX "")
endif()
file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX}"
DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
vcpkg_copy_tools(TOOL_NAMES stxxl_tool AUTO_CLEAN)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/bin"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/bin"
)
# Handle copyright
configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt")

View File

@ -1,7 +1,7 @@
{
"name": "stxxl",
"version-date": "2018-11-15",
"port-version": 8,
"port-version": 9,
"description": "Standard Template Library for Extra Large Data Sets",
"supports": "!uwp",
"dependencies": [

View File

@ -1095,11 +1095,6 @@ spscqueue:x64-android=fail
stormlib:arm64-uwp=fail
stormlib:x64-uwp=fail
stxxl:arm-neon-android=fail
# upstream issue https://github.com/stxxl/stxxl/issues/99
stxxl:x86-windows=skip
stxxl:x64-windows=skip
stxxl:x64-windows-static=skip
stxxl:x64-windows-static-md=skip
systemc:arm64-windows=fail
systemc:arm64-windows-static-md=fail
systemc:arm64-uwp=fail

View File

@ -8782,7 +8782,7 @@
},
"stxxl": {
"baseline": "2018-11-15",
"port-version": 8
"port-version": 9
},
"suitesparse": {
"baseline": "5.8.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f24aba85347c3466740c7b964ac1d5fd8f03cb77",
"version-date": "2018-11-15",
"port-version": 9
},
{
"git-tree": "1317b4d308dbd0739714615e46ffab600d2fc462",
"version-date": "2018-11-15",