Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 12a0368

Browse files
committed
fix patch
1 parent 8e7133c commit 12a0368

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

micromamba/patches/libmamba_deps.patch

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
2-
index a78d0dc..407e3b1 100644
2+
index f592db2..22b1f40 100644
33
--- a/libmamba/CMakeLists.txt
44
+++ b/libmamba/CMakeLists.txt
5-
@@ -201,36 +201,29 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
5+
@@ -263,36 +263,29 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
66
libcurl.a
77
libssh2.a
88

@@ -44,7 +44,7 @@ index a78d0dc..407e3b1 100644
4444
set(STATIC_DEPS "")
4545
foreach(LIB ${REQUIRED_STATIC_DEPS})
4646
set(TMP_LIB "${LIB}-NOTFOUND")
47-
@@ -243,8 +236,9 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
47+
@@ -305,8 +298,9 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
4848
if (APPLE)
4949
find_library(SECURITY_LIBRARY Security)
5050
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
@@ -56,7 +56,7 @@ index a78d0dc..407e3b1 100644
5656
endif()
5757

5858
message(" -> Found static dependencies:")
59-
@@ -267,48 +261,34 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
59+
@@ -329,19 +323,16 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
6060
set(CMAKE_PREFIX_PATH "$ENV{VCPKG_ROOT}/installed/x64-windows-static/")
6161

6262
# For Windows we have a vcpkg based build system right now.
@@ -74,18 +74,16 @@ index a78d0dc..407e3b1 100644
7474
-
7575
- find_library(LIBSOLV_BUILD_STATICRARIES NAMES solv_static)
7676
- find_library(LIBSOLVEXT_BUILD_STATICRARIES NAMES solvext_static)
77-
- find_package(reproc++ CONFIG REQUIRED)
77+
+
7878
+ find_library(LIBZSTD_LIBRARY NAMES zstd_static.lib)
7979
+ find_library(BZIP2_LIBRARIES NAMES bz2.lib)
8080
+ find_library(CRYPTO_LIBRARIES NAMES libcrypto_static)
81-
82-
- find_library(LIBXML2_LIBRARY NAMES libxml2)
83-
- find_library(ICONV_LIBRARY NAMES libiconv)
84-
- find_library(CHARSET_LIBRARY NAMES libcharset)
85-
- message("Found: ${LIBXML2_LIBRARY} ${ICONV_LIBRARY} ${CHARSET_LIBRARY}")
8681
+ find_library(LIBSOLV_STATIC_LIBRARIES NAMES solv_static)
8782
+ find_library(LIBSOLVEXT_STATIC_LIBRARIES NAMES solvext_static)
88-
+ find_package(reproc++ CONFIG REQUIRED)
83+
find_package(reproc++ CONFIG REQUIRED)
84+
find_package(tl-expected REQUIRED)
85+
86+
@@ -352,27 +343,21 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
8987

9088
target_link_libraries(${target_name} PUBLIC
9189
${CRYPTO_LIBRARIES}
@@ -111,6 +109,7 @@ index a78d0dc..407e3b1 100644
111109
+ ${LIBSOLVEXT_STATIC_LIBRARIES}
112110
reproc++
113111
- reproc
112+
tl::expected
114113
)
115114

116115
- add_definitions("-DLIBARCHIVE_STATIC -DCURL_STATICLIB -DSOLV_BUILD_STATIC")

0 commit comments

Comments
 (0)