Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zstd for openSUSE:Factory checked in at 2025-03-31 11:38:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zstd (Old) and /work/SRC/openSUSE:Factory/.zstd.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zstd" Mon Mar 31 11:38:11 2025 rev:41 rq:1265120 version:1.5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/zstd/zstd.changes 2025-03-20 19:23:27.541836155 +0100 +++ /work/SRC/openSUSE:Factory/.zstd.new.2696/zstd.changes 2025-03-31 11:39:25.270815078 +0200 @@ -1,0 +2,6 @@ +Tue Mar 25 10:45:34 UTC 2025 - Christophe Marin <[email protected]> + +- Add patch (non-upstreamable): + * 0001-Don-t-export-libzstd_static-CMake-target.patch + +------------------------------------------------------------------- New: ---- 0001-Don-t-export-libzstd_static-CMake-target.patch BETA DEBUG BEGIN: New:- Add patch (non-upstreamable): * 0001-Don-t-export-libzstd_static-CMake-target.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zstd.spec ++++++ --- /var/tmp/diff_new_pack.ZL9ncI/_old 2025-03-31 11:39:25.870839941 +0200 +++ /var/tmp/diff_new_pack.ZL9ncI/_new 2025-03-31 11:39:25.874840107 +0200 @@ -35,6 +35,8 @@ Source1: https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig Source2: zstd.keyring Source99: baselibs.conf +# PATCH-FIX-OPENSUSE -- 0001-Don-t-export-libzstd_static-CMake-target.patch +Patch0: 0001-Don-t-export-libzstd_static-CMake-target.patch %if %{with cmake} BuildRequires: cmake %endif ++++++ 0001-Don-t-export-libzstd_static-CMake-target.patch ++++++ >From f40bbc53bffb905b735c2584c80da396b7a97ed0 Mon Sep 17 00:00:00 2001 From: Christophe Marin <[email protected]> Date: Tue, 25 Mar 2025 11:44:48 +0100 Subject: [PATCH] Don't export libzstd_static CMake target Exporting the libzstd_static means it must be present when CMake looks for zstd, which breaks openSUSE policies. --- build/cmake/lib/CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt index 4e902a1..2ce926d 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt @@ -138,7 +138,8 @@ endif () if (ZSTD_BUILD_STATIC) add_library(libzstd_static STATIC ${Sources} ${Headers}) target_include_directories(libzstd_static INTERFACE $<BUILD_INTERFACE:${PUBLIC_INCLUDE_DIRS}>) - list(APPEND library_targets libzstd_static) + # The static library is not added to the array to avoid requiring it when looking for zstd + # list(APPEND library_targets libzstd_static) if (ZSTD_MULTITHREAD_SUPPORT) set_property(TARGET libzstd_static APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_MULTITHREAD") if (UNIX) @@ -207,7 +208,7 @@ if (ZSTD_BUILD_SHARED) OUTPUT_NAME zstd VERSION ${ZSTD_FULL_VERSION} SOVERSION ${zstd_VERSION_MAJOR}) - + if (ZSTD_FRAMEWORK) set_target_properties( libzstd_shared @@ -283,6 +284,18 @@ install(TARGETS ${library_targets} PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) +if(ZSTD_BUILD_STATIC) + install(TARGETS libzstd_static + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT runtime OPTIONAL + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) +endif() + # uninstall target if (NOT TARGET uninstall) configure_file( -- 2.49.0
