diff --git a/libmamba.yaml b/libmamba.yaml index c144b427894..27926bdd285 100644 --- a/libmamba.yaml +++ b/libmamba.yaml @@ -1,6 +1,6 @@ package: name: libmamba - version: "2.4.0" + version: "2.5.0" epoch: 0 description: Cross-Platform Package Manager copyright: @@ -59,7 +59,7 @@ environment: pipeline: - uses: git-checkout with: - expected-commit: 6f11ca27b4cf4987ee86ffd0174954784c114022 + expected-commit: 55ddf242be5969b8b6de52e4ec517b996a89ce38 repository: https://github.com/mamba-org/mamba tag: ${{package.version}} @@ -73,10 +73,13 @@ pipeline: opts: | -DBUILD_LIBMAMBA="ON" \ -DBUILD_SHARED="ON" \ + -DBUILD_STATIC="OFF" \ -DBUILD_LIBMAMBAPY="ON" \ -DBUILD_MICROMAMBA="ON" \ -DBUILD_MAMBA_PACKAGE="ON" \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_LIBMAMBA_SPDLOG=ON \ + -DCMAKE_CXX_FLAGS="-DSPDLOG_FMT_EXTERNAL" \ + -DCMAKE_POSITION_INDEPENDENT_CODE="ON" - uses: cmake/build @@ -98,7 +101,7 @@ subpackages: mkdir -p wrapper-bin cat > wrapper-bin/python${{range.key}} < + From: https://github.com/wolfi-dev/os/pull/29763#issuecomment-2463427683 +Signed-off-by: Arturo Borrero Gonzalez +--- + libmamba/CMakeLists.txt | 141 ----------------------------------------------- + 1 file changed, 1 insertion(+), 140 deletions(-) diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt -index 582d82b..548e0f2 100644 +index 4e3cf59..e7c5da7 100644 --- a/libmamba/CMakeLists.txt +++ b/libmamba/CMakeLists.txt -@@ -470,146 +470,7 @@ macro(libmamba_create_target target_name linkage output_name) - SPDLOG_FMT_EXTERNAL "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${BUILD_LOG_LEVEL}" - ) +@@ -469,146 +469,7 @@ macro(libmamba_create_target target_name linkage output_name) + mamba_target_add_compile_warnings(${target_name} WARNING_AS_ERROR ${MAMBA_WARNING_AS_ERROR}) + mamba_target_set_lto(${target_name} MODE ${MAMBA_LTO}) - if(${linkage_upper} STREQUAL "STATIC") - message(" -> Statically linking against libmamba (static) dependencies") @@ -17,7 +25,7 @@ index 582d82b..548e0f2 100644 - - target_link_libraries( - ${target_name} -- PUBLIC fmt::fmt-header-only spdlog::spdlog_header_only yaml-cpp::yaml-cpp +- PUBLIC fmt::fmt-header-only yaml-cpp::yaml-cpp - PRIVATE - reproc - reproc++