Merge pull request #194 from sdebionne/add-cobalt-library

Add cobalt library

.ci_support/linux_64_.yaml

@@ -1,7 +1,3 @@
-NP_DUMMY_VER:
-- '1.21'
-PY_DUMMY_VER:
-- '3.10'
 bzip2:
 - '1'
 cdt_name:

.ci_support/linux_aarch64_.yaml

@@ -1,9 +1,5 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
-NP_DUMMY_VER:
-- '1.21'
-PY_DUMMY_VER:
-- '3.10'
 bzip2:
 - '1'
 cdt_arch:

.ci_support/linux_ppc64le_.yaml

@@ -1,7 +1,3 @@
-NP_DUMMY_VER:
-- '1.21'
-PY_DUMMY_VER:
-- '3.10'
 bzip2:
 - '1'
 cdt_name:

.ci_support/osx_64_.yaml

@@ -1,9 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-NP_DUMMY_VER:
-- '1.21'
-PY_DUMMY_VER:
-- '3.10'
+- '10.13'
 bzip2:
 - '1'
 channel_sources:

.ci_support/osx_arm64_.yaml

@@ -1,9 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-NP_DUMMY_VER:
-- '1.21'
-PY_DUMMY_VER:
-- '3.10'
 bzip2:
 - '1'
 channel_sources:

.ci_support/win_64_.yaml

@@ -1,7 +1,3 @@
-NP_DUMMY_VER:
-- '1.21'
-PY_DUMMY_VER:
-- '3.10'
 bzip2:
 - '1'
 channel_sources:

recipe/bld.bat

@@ -23,6 +23,7 @@ mkdir temp_prefix
  variant=release ^
  threading=multi ^
  link=shared ^
+ cxxstd=20 ^
  -s NO_COMPRESSION=0 ^
  -s NO_ZLIB=0 ^
  -s NO_BZIP2=0 ^

recipe/build.sh

@@ -17,6 +17,8 @@ CXXFLAGS="${CXXFLAGS} -fPIC"
 
 if [[ "${target_platform}" == osx* ]]; then
  TOOLSET=clang
+ # see https://conda-forge.org/docs/maintainer/knowledge_base/#newer-c-features-with-old-sdk
+ CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
 elif [[ "${target_platform}" == linux* ]]; then
  TOOLSET=gcc
 fi
@@ -75,6 +77,7 @@ mkdir temp_prefix
  include="${INCLUDE_PATH}" \
  cxxflags="${CXXFLAGS}" \
  linkflags="${LINKFLAGS}" \
+ cxxstd=20 \
  --layout=system \
  -j"${CPU_COUNT}" \
  install

recipe/conda_build_config.yaml

@@ -1,6 +1,3 @@
-# we only need _a_ python version to build the headers for libboost-headers,
-# putting it in CBC means it's accessible also in the build scripts
-PY_DUMMY_VER:
- - "3.10"
-NP_DUMMY_VER:
- - "1.21"
+# Bump MacOs target to 10.13 for Boost.Cobalt / C++20 support
+MACOSX_DEPLOYMENT_TARGET:
+ - '10.13' # [osx and x86_64]

recipe/meta.yaml

@@ -1,7 +1,7 @@
 {% set version = "1.84.0" %}
 
 {% set boost_libs = [
- "atomic", "chrono", "container", "context", "contract", "coroutine",
+ "atomic", "chrono", "cobalt", "container", "context", "contract", "coroutine",
  "date_time", "filesystem", "graph", "iostreams", "locale", "log", "log_setup",
  "math_c99", "math_c99f", "math_tr1", "math_tr1f", "prg_exec_monitor",
  "program_options", "random", "regex", "serialization", "system", "thread",
@@ -11,6 +11,11 @@
 {% set boost_libs_static_only = ["exception", "test_exec_monitor"] %}
 {% set boost_libs_py = ["python%s" % py, "numpy%s" % py] %}
 
+# we only need _a_ python version to build the headers for libboost-headers,
+# make it accessible in the build scripts via build/script_env below.
+{% set PY_DUMMY_VER = "3.10" %}
+{% set NP_DUMMY_VER = "1.21" %}
+
 package:
  name: boost-split
  version: {{ version }}
@@ -21,25 +26,29 @@ source:
  patches:
  # ensure our compiler flags get used during bootstrapping 
  - patches/0001-Add-default-value-for-cxx-and-cxxflags-options-for-t.patch
+ - patches/0002-Reimplement-string_set-as-any_string.patch
 
 build:
- number: 1
+ number: 2
+ script_env:
+ - PY_DUMMY_VER={{ PY_DUMMY_VER }}
+ - NP_DUMMY_VER={{ NP_DUMMY_VER }}
 
 requirements:
  build:
  - {{ compiler('cxx') }}
  - cross-python_{{ target_platform }} # [build_platform != target_platform]
- - python {{ PY_DUMMY_VER }} *cpython  # [build_platform != target_platform]
- - numpy {{ NP_DUMMY_VER }}  # [build_platform != target_platform]
+ - python {{ PY_DUMMY_VER }}.* *_cpython # [build_platform != target_platform]
+ - numpy {{ NP_DUMMY_VER }}.* # [build_platform != target_platform]
  host:
  - icu # [unix]
  - xz # [unix]
  - bzip2
  - zlib
  - zstd
  # see conda_build_config
- - python {{ PY_DUMMY_VER }} *cpython
- - numpy {{ NP_DUMMY_VER }}
+ - python {{ PY_DUMMY_VER }}.* *_cpython
+ - numpy {{ NP_DUMMY_VER }}.*
 
 outputs:
  - name: libboost-headers
@@ -97,6 +106,8 @@ outputs:
  - xz
  - zlib
  - zstd
+ run:
+ - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
  run_constrained:
  # Anaconda's output is also called libboost; therefore we automatically
  # avoid issues of co-installability, because a package with the same name