mirror of https://github.com/mamba-org/mamba.git
remove patches for feedstock (#2216)
This commit is contained in:
parent
1de3df2fc3
commit
3f2135ef9e
|
@ -298,7 +298,6 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
|
|||
libzstd.a
|
||||
libz.a
|
||||
liblzma.a
|
||||
liblzo2.a
|
||||
|
||||
libnghttp2.a
|
||||
|
||||
|
@ -311,6 +310,9 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
|
|||
set(REQUIRED_STATIC_DEPS ${REQUIRED_STATIC_DEPS} libc++.a)
|
||||
endif()
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
||||
list(REMOVE_ITEM REQUIRED_STATIC_DEPS libiconv.a)
|
||||
endif()
|
||||
|
||||
set(STATIC_DEPS "")
|
||||
foreach(LIB ${REQUIRED_STATIC_DEPS})
|
||||
|
@ -323,9 +325,10 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
|
|||
|
||||
if (APPLE)
|
||||
find_library(SECURITY_LIBRARY Security)
|
||||
find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
|
||||
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
|
||||
message("Found library: ${SECURITY_LIBRARY}\n${COREFOUNDATION_LIBRARY}")
|
||||
list(APPEND STATIC_DEPS ${COREFOUNDATION_LIBRARY} ${SECURITY_LIBRARY})
|
||||
list(APPEND STATIC_DEPS ${COREFOUNDATION_LIBRARY} ${SECURITY_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY})
|
||||
endif()
|
||||
|
||||
message(" -> Found static dependencies:")
|
||||
|
@ -395,7 +398,7 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
|
|||
${LIBLZMA_LIBRARIES}
|
||||
CURL::libcurl
|
||||
nlohmann_json::nlohmann_json
|
||||
fmt::fmt
|
||||
fmt::fmt-header-only
|
||||
# Since conda-forge spdlog is built with a bundled version of fmt we use the
|
||||
# header only version to avoid chasing after the correct fmt version mathching
|
||||
# the one used in the bundle
|
||||
|
|
|
@ -11,6 +11,9 @@ cmake_policy(SET CMP0057 NEW)
|
|||
|
||||
project(libmambapy)
|
||||
|
||||
find_package(fmt REQUIRED)
|
||||
find_package(spdlog REQUIRED)
|
||||
|
||||
if(NOT TARGET libmamba)
|
||||
find_package(libmamba REQUIRED)
|
||||
endif ()
|
||||
|
|
|
@ -7,8 +7,6 @@ package:
|
|||
|
||||
source:
|
||||
- git_url: ../../
|
||||
patches:
|
||||
- libmamba.patch
|
||||
|
||||
build:
|
||||
number: {{ build_num }}
|
||||
|
|
Loading…
Reference in New Issue