From 9b68439bfb9cd829a4e9ce338ea550376ff9fbe1 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 16:25:50 +0000 Subject: [PATCH 01/34] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning off CI for master to main migration --- .circleci/config.yml | 1 + azure-pipelines.yml => azure-pipelines.yml.bak | 0 2 files changed, 1 insertion(+) rename azure-pipelines.yml => azure-pipelines.yml.bak (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b8..cf397d5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,4 @@ + # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- diff --git a/azure-pipelines.yml b/azure-pipelines.yml.bak similarity index 100% rename from azure-pipelines.yml rename to azure-pipelines.yml.bak From 79ad996bb2e5e06fd19fd466e5dedc93bfd03864 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 16:25:57 +0000 Subject: [PATCH 02/34] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning on CI for master to main migration --- .circleci/config.yml | 1 - azure-pipelines.yml.bak => azure-pipelines.yml | 0 2 files changed, 1 deletion(-) rename azure-pipelines.yml.bak => azure-pipelines.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf397d5d..6ad461b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,3 @@ - # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- diff --git a/azure-pipelines.yml.bak b/azure-pipelines.yml similarity index 100% rename from azure-pipelines.yml.bak rename to azure-pipelines.yml From f85b0a87fc8d85c995a3a76a9cf49dc30925335b Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 16:25:57 +0000 Subject: [PATCH 03/34] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeMasterToMain --- .github/workflows/automerge.yml | 2 +- .github/workflows/webservices.yml | 2 +- conda-forge.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f79fe856..773b3d12 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71f..d6f06b5c 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/conda-forge.yml b/conda-forge.yml index 65c445ef..41cb6616 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -6,3 +6,6 @@ build_platform: osx_arm64: osx_64 channel_priority: flexible test_on_native_only: true +github: + branch_name: main + tooling_branch_name: main From 7814ff0ea3226c1eecf442006591bfd121253fbf Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Mar 2022 06:39:00 +0000 Subject: [PATCH 04/34] updated v14.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc72bbbe..d79b05a5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "13.0.1" %} +{% set version = "14.0.0" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8 + sha256: 35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23 patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch From 622d42e981775edd70e5dbee41dfacebea729438 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Mar 2022 06:39:39 +0000 Subject: [PATCH 05/34] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and conda-forge-pinning 2022.03.22.19.17.12 --- .ci_support/README | 12 ++++++------ README.md | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.ci_support/README b/.ci_support/README index 69c5db60..a47316be 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1,6 +1,6 @@ -This file is automatically generated by conda-smithy. If any -particular build configuration is expected, but it is not found, -please make sure all dependencies are satisfiable. To add/modify any -matrix elements, you should create/change conda-smithy's input -recipe/conda_build_config.yaml and re-render the recipe, rather than -editing these files directly. +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/README.md b/README.md index 3ecc0496..f7425130 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: http://llvm.org/ Package license: Apache-2.0 WITH LLVM-exception -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libcxx-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libcxx-feedstock/blob/main/LICENSE.txt) Summary: LLVM C++ standard library @@ -20,8 +20,8 @@ Current build status
- - + + @@ -29,22 +29,22 @@ Current build status From b5abc308d7343c9794f8487df9d40f0d5df8e933 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 28 Apr 2022 23:58:17 +1100 Subject: [PATCH 06/34] remove rc-channels --- recipe/conda_build_config.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4980376c..cdb43d4c 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -9,12 +9,6 @@ cxx_compiler: vc: - 14 -channel_targets: - - conda-forge llvm_rc - -channel_sources: - - conda-forge/label/llvm_rc,conda-forge - # libcxx only supports the last released GCC version, see # https://releases.llvm.org/13.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support c_compiler_version: # [linux] From 001d5fec2822c851ddc7ae4f6fcc20e49f1774b1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 28 Apr 2022 23:59:40 +1100 Subject: [PATCH 07/34] add dev_url --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d79b05a5..24219567 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -97,6 +97,7 @@ about: license_file: libcxx/LICENSE.TXT license_family: Apache summary: LLVM C++ standard library + dev_url: https://github.com/llvm/llvm-project extra: recipe-maintainers: From 0355b97d99581f433ad4c7428974d64264fb6b88 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Apr 2022 10:55:07 +1100 Subject: [PATCH 08/34] align some selectors --- recipe/meta.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24219567..bd2b380c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,8 +45,8 @@ outputs: - Library/bin/c++*.dll - Library/lib/c++*.lib - Library/lib/libc++*.lib - requirements: # [linux] - run: # [linux] + requirements: # [linux] + run: # [linux] - {{ pin_subpackage("libcxxabi", exact=True) }} # [linux] test: requires: @@ -62,19 +62,19 @@ outputs: - compile_test.bat # [win] commands: # Dummy var for different hashes - - echo {{ dummy_var }} # [osx] - - if not exist %LIBRARY_INC%\\c++\\v1\\iterator exit 1 # [win] - - test -f $PREFIX/include/c++/v1/iterator # [unix] - - bash compile_test.sh # [unix] - - compile_test.bat # [win] + - echo {{ dummy_var }} # [osx] + - if not exist %LIBRARY_INC%\\c++\\v1\\iterator exit 1 # [win] + - test -f $PREFIX/include/c++/v1/iterator # [unix] + - bash compile_test.sh # [unix] + - compile_test.bat # [win] # !!!!!!!!!!!! README !!!!!!!!!!!!!!!!!! # we do not ship libcxxabi on OSX - this breaks exception passing - if [ -f $PREFIX/lib/libc++abi.dylib ]; then exit 1; fi # [osx] - - test -f $PREFIX/lib/libc++abi.so # [linux] + - test -f $PREFIX/lib/libc++abi.so # [linux] # Following 2 projects had issues with libc++, so check them # before releasing just to be sure. - downstreams: # [osx] + downstreams: # [osx] - python-symengine # [osx] - openturns # [osx] - libcxx-testing # [osx] From 17326f9c9e4a09d604364a357534ce5bf8785e03 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Apr 2022 10:55:21 +1100 Subject: [PATCH 09/34] remove redundant skip --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bd2b380c..f990af62 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,6 @@ source: build: number: 0 - skip: true # [win and vc<14] skip: true # [win] skip: true # [ppc64le or aarch64] ignore_run_exports: From 203e0d92f40f4bb1b0ab6a9de8e99f4b0fa69411 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Apr 2022 10:57:30 +1100 Subject: [PATCH 10/34] set feedstock name --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f990af62..7d7f2507 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -107,3 +107,4 @@ extra: - beckermr - timsnyder - h-vetinari + feedstock-name: libcxx From e6a7a90812914cf5dab44b526e5bdcf3e9c33d05 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 29 Apr 2022 10:59:07 +1100 Subject: [PATCH 11/34] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.04.28.22.31.46 --- .ci_support/linux_64_.yaml | 6 ++-- .ci_support/osx_64_.yaml | 8 ++--- .ci_support/osx_arm64_.yaml | 8 ++--- README.md | 59 +++++++++++++++++++++++++++---------- 4 files changed, 52 insertions(+), 29 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 32e72ab8..e4b57e48 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: @@ -12,5 +12,3 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: - linux-64 -vc: -- '14' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 3894343a..8c117a4e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,13 +3,13 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.14' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '12' +- '13' dummy_var: - '0' macos_machine: @@ -21,5 +21,3 @@ pin_run_as_build: max_pin: x.x target_platform: - osx-64 -vc: -- '14' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 663777ca..3e126806 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,13 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '12' +- '13' dummy_var: - '1' macos_machine: @@ -19,5 +19,3 @@ pin_run_as_build: max_pin: x.x target_platform: - osx-arm64 -vc: -- '14' diff --git a/README.md b/README.md index f7425130..140e44ff 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -About libcxx_and_libcxxabi -========================== +About libcxx +============ Home: http://llvm.org/ @@ -9,6 +9,8 @@ Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libcxx-feedstoc Summary: LLVM C++ standard library +Development: https://github.com/llvm/llvm-project + Current build status ==================== @@ -63,28 +65,53 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libcxx-green.svg)](https://anaconda.org/conda-forge/libcxx) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libcxx.svg)](https://anaconda.org/conda-forge/libcxx) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libcxx.svg)](https://anaconda.org/conda-forge/libcxx) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libcxx.svg)](https://anaconda.org/conda-forge/libcxx) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libcxxabi-green.svg)](https://anaconda.org/conda-forge/libcxxabi) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libcxxabi.svg)](https://anaconda.org/conda-forge/libcxxabi) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libcxxabi.svg)](https://anaconda.org/conda-forge/libcxxabi) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libcxxabi.svg)](https://anaconda.org/conda-forge/libcxxabi) | -Installing libcxx_and_libcxxabi -=============================== +Installing libcxx +================= -Installing `libcxx_and_libcxxabi` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `libcxx` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libcxx, libcxxabi` can be installed with: +Once the `conda-forge` channel has been enabled, `libcxx, libcxxabi` can be installed with `conda`: ``` conda install libcxx libcxxabi ``` -It is possible to list all of the versions of `libcxx` available on your platform with: +or with `mamba`: + +``` +mamba install libcxx libcxxabi +``` + +It is possible to list all of the versions of `libcxx` available on your platform with `conda`: ``` conda search libcxx --channel conda-forge ``` +or with `mamba`: + +``` +mamba search libcxx --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search libcxx --channel conda-forge + +# List packages depending on `libcxx`: +mamba repoquery whoneeds libcxx --channel conda-forge + +# List dependencies of `libcxx`: +mamba repoquery depends libcxx --channel conda-forge +``` + About conda-forge ================= @@ -100,10 +127,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. @@ -125,17 +154,17 @@ Terminology produce the finished article (built conda distributions) -Updating libcxx_and_libcxxabi-feedstock -======================================= +Updating libcxx-feedstock +========================= -If you would like to improve the libcxx_and_libcxxabi recipe or build a new +If you would like to improve the libcxx recipe or build a new package version, please fork this repository and submit a PR. Upon submission, your changes will be run on the appropriate platforms to give the reviewer an opportunity to confirm that the changes result in a successful build. Once merged, the recipe will be re-built and uploaded automatically to the `conda-forge` channel, whereupon the built conda packages will be available for everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/libcxx_and_libcxxabi-feedstock are +Note that all branches in the conda-forge/libcxx-feedstock are immediately built and any created packages are uploaded, so PRs should be based on branches in forks and branches in the main repository should only be used to build distinct package versions. From 20d17ff46b994f919434bad234bbedc20802fea4 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Fri, 6 May 2022 00:00:26 +0800 Subject: [PATCH 12/34] update URL; retrigger CI --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7d7f2507..554309b7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -91,7 +91,7 @@ outputs: - test -f $PREFIX/lib/libc++abi.so # [linux] about: - home: http://llvm.org/ + home: http://libcxx.llvm.org/ license: Apache-2.0 WITH LLVM-exception license_file: libcxx/LICENSE.TXT license_family: Apache From a2467044d39f055eea2550f1a97a154dcacad8bc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 5 May 2022 16:40:50 +0000 Subject: [PATCH 13/34] updated v14.0.3 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 554309b7..ea73118f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.0" %} +{% set version = "14.0.3" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23 + sha256: 44d3e7a784d5cf805e72853bb03f218bd1058d448c03ca883dabbebc99204e0c patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch @@ -44,8 +44,8 @@ outputs: - Library/bin/c++*.dll - Library/lib/c++*.lib - Library/lib/libc++*.lib - requirements: # [linux] - run: # [linux] + requirements: # [linux] + run: # [linux] - {{ pin_subpackage("libcxxabi", exact=True) }} # [linux] test: requires: @@ -73,7 +73,7 @@ outputs: # Following 2 projects had issues with libc++, so check them # before releasing just to be sure. - downstreams: # [osx] + downstreams: # [osx] - python-symengine # [osx] - openturns # [osx] - libcxx-testing # [osx] From deaf5098b6072f5ffd97b6de35337363076db62b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 5 May 2022 16:41:24 +0000 Subject: [PATCH 14/34] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.05.05.16.37.34 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 140e44ff..d2ded341 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ About libcxx ============ -Home: http://llvm.org/ +Home: http://libcxx.llvm.org/ Package license: Apache-2.0 WITH LLVM-exception From 0d4fa1b325701d71144a510073219660e81665bb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 25 May 2022 14:25:22 +0000 Subject: [PATCH 15/34] updated v14.0.4 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ea73118f..2209c59a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.3" %} +{% set version = "14.0.4" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 44d3e7a784d5cf805e72853bb03f218bd1058d448c03ca883dabbebc99204e0c + sha256: f40c77ceff02ae3873d273a51b0f93cd8e6409576f771d860d75835335522052 patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch From cf66016a889fcd2c28530cc3997a5da05fc16d4d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 11 Jun 2022 10:30:44 +0000 Subject: [PATCH 16/34] updated v14.0.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2209c59a..b7c3338d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.4" %} +{% set version = "14.0.5" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: f40c77ceff02ae3873d273a51b0f93cd8e6409576f771d860d75835335522052 + sha256: c9d27903ba3883c476a83cd515e36e1e07b0585db55692835de11385d9e3c8fa patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch From 119e5907cf67434d7798b56434b4e82af3ba8cf1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 11 Jun 2022 10:31:16 +0000 Subject: [PATCH 17/34] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.20.0, and conda-forge-pinning 2022.06.10.18.09.10 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b8..3e61aa24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. From 1afebdc310960ded5e55e9971b7e3f39bad8e6c5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jun 2022 19:06:18 -0500 Subject: [PATCH 18/34] Keep compiler to use the correct cctools --- recipe/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b7c3338d..6dabb936 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - patches/0004-custom-error-message-for-old-sdk.patch build: - number: 0 + number: 1 skip: true # [win] skip: true # [ppc64le or aarch64] ignore_run_exports: @@ -44,8 +44,11 @@ outputs: - Library/bin/c++*.dll - Library/lib/c++*.lib - Library/lib/libc++*.lib - requirements: # [linux] - run: # [linux] + requirements: + build: + - {{ compiler('cxx') }} + host: + run: - {{ pin_subpackage("libcxxabi", exact=True) }} # [linux] test: requires: From b114dff1411d92408fcc5e4039d996622d7f9f8e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 25 Jun 2022 07:00:26 +0000 Subject: [PATCH 19/34] updated v14.0.6 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6dabb936..2427f796 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.5" %} +{% set version = "14.0.6" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: c9d27903ba3883c476a83cd515e36e1e07b0585db55692835de11385d9e3c8fa + sha256: 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch @@ -15,7 +15,7 @@ source: - patches/0004-custom-error-message-for-old-sdk.patch build: - number: 1 + number: 0 skip: true # [win] skip: true # [ppc64le or aarch64] ignore_run_exports: From 1603bbb604bada0bf5d2ee87dbcb0209c4de3fb3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 25 Jun 2022 07:00:43 +0000 Subject: [PATCH 20/34] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and conda-forge-pinning 2022.06.24.18.35.54 --- .scripts/build_steps.sh | 9 ++++++++- .scripts/run_osx_build.sh | 4 ++++ LICENSE.txt | 30 ++++++++++++++++++++++-------- build-locally.py | 19 +++++++++++++------ 4 files changed, 47 insertions(+), 15 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index c6b23e87..a6b09f6b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,7 +24,10 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 3d855059..736a39a0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -61,6 +61,10 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then fi +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/LICENSE.txt b/LICENSE.txt index 6ec14012..2ec51d75 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +BSD-3-Clause license Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/build-locally.py b/build-locally.py index eec38a04..3f4b7a79 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": From 9d7725aadd4d3ee7141c4cc6b4db05518c0790bd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 12 Aug 2022 08:18:08 +0200 Subject: [PATCH 21/34] Revert "remove rc-channels" This reverts commit b5abc308d7343c9794f8487df9d40f0d5df8e933. --- recipe/conda_build_config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index cdb43d4c..4980376c 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -9,6 +9,12 @@ cxx_compiler: vc: - 14 +channel_targets: + - conda-forge llvm_rc + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge + # libcxx only supports the last released GCC version, see # https://releases.llvm.org/13.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support c_compiler_version: # [linux] From 921d4612828ae649486a5a87cc3e1089c5279e1a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 12 Aug 2022 08:20:29 +0200 Subject: [PATCH 22/34] bump to 15.0.0.rc2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2427f796..6846dedc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "14.0.6" %} +{% set version = "15.0.0.rc2" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a + sha256: 00211c8789009610f592d3bbbd0f328d011c26935aabaa2628ec4d8c3cc9b647 patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch From c956fae3b9df5cb11d1d287b32ef7f2c1c384702 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 12 Aug 2022 15:18:39 +0200 Subject: [PATCH 23/34] rebase patches --- .../0001-libcxxabi-10.9-compatibility.patch | 4 +- ...002-Support-legacy-standalone-builds.patch | 8 +-- ...03-Fix-ABI-compatibility-with-system.patch | 14 +++--- ...004-custom-error-message-for-old-sdk.patch | 50 ++++++++++--------- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/recipe/patches/0001-libcxxabi-10.9-compatibility.patch b/recipe/patches/0001-libcxxabi-10.9-compatibility.patch index e40502d2..9796aa93 100644 --- a/recipe/patches/0001-libcxxabi-10.9-compatibility.patch +++ b/recipe/patches/0001-libcxxabi-10.9-compatibility.patch @@ -1,4 +1,4 @@ -From f92a414a9219f79c3359bf296ca5cf14ec88dc34 Mon Sep 17 00:00:00 2001 +From a26ecf9b6621c6d896cf9b757e27b9baa15bc12f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 8 Aug 2020 15:52:31 +0000 Subject: [PATCH 1/4] libcxxabi 10.9 compatibility @@ -24,5 +24,5 @@ index ee15e437e602..8933a9b747a6 100644 } // namespace std -- -2.35.1.windows.2 +2.37.0.windows.1 diff --git a/recipe/patches/0002-Support-legacy-standalone-builds.patch b/recipe/patches/0002-Support-legacy-standalone-builds.patch index 8c89223f..3b27c2b5 100644 --- a/recipe/patches/0002-Support-legacy-standalone-builds.patch +++ b/recipe/patches/0002-Support-legacy-standalone-builds.patch @@ -1,4 +1,4 @@ -From e02e436ece48dab41f2f1337c25e0ca309b4697e Mon Sep 17 00:00:00 2001 +From 130d354336d74b40606c5ae45ef27bf44e97a449 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 18 May 2021 19:51:28 -0500 Subject: [PATCH 2/4] Support legacy standalone builds @@ -8,10 +8,10 @@ Subject: [PATCH 2/4] Support legacy standalone builds 1 file changed, 17 insertions(+) diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt -index 12dcdf954405..d2c33141c77b 100644 +index 9abf548abbb9..3f155af09e73 100644 --- a/libcxx/src/CMakeLists.txt +++ b/libcxx/src/CMakeLists.txt -@@ -265,6 +265,23 @@ if (LIBCXX_ENABLE_SHARED) +@@ -236,6 +236,23 @@ if (LIBCXX_ENABLE_SHARED) "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/../lib/weak.exp") target_link_libraries(cxx_shared PRIVATE $) @@ -36,5 +36,5 @@ index 12dcdf954405..d2c33141c77b 100644 # Generate a linker script in place of a libc++.so symlink. -- -2.35.1.windows.2 +2.37.0.windows.1 diff --git a/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch b/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch index 45d2aa8c..e74d0c4f 100644 --- a/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch +++ b/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch @@ -1,4 +1,4 @@ -From e378e3f253ca8255927aa767feb1eb2a1901414d Mon Sep 17 00:00:00 2001 +From edebfefbfca06af0dd5cb1472ce462cd27f10b71 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 13 Jul 2021 01:57:06 -0500 Subject: [PATCH 3/4] Fix ABI compatibility with system @@ -8,10 +8,10 @@ Subject: [PATCH 3/4] Fix ABI compatibility with system 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp -index 2234784769dd..d69e8c43a467 100644 +index 6b454274e130..5e601e133a2e 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp -@@ -198,10 +198,6 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH +@@ -194,10 +194,6 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH install(&make >(1u)); install(&make >(1u)); _LIBCPP_SUPPRESS_DEPRECATED_POP @@ -22,7 +22,7 @@ index 2234784769dd..d69e8c43a467 100644 install(&make >(1u)); #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS install(&make >(1u)); -@@ -240,6 +236,10 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP +@@ -236,6 +232,10 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS install(&make<_VSTD::messages >(1u)); #endif @@ -33,7 +33,7 @@ index 2234784769dd..d69e8c43a467 100644 } locale::__imp::__imp(const string& name, size_t refs) -@@ -271,10 +271,6 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH +@@ -267,10 +267,6 @@ _LIBCPP_SUPPRESS_DEPRECATED_PUSH install(new codecvt_byname(name_)); install(new codecvt_byname(name_)); _LIBCPP_SUPPRESS_DEPRECATED_POP @@ -44,7 +44,7 @@ index 2234784769dd..d69e8c43a467 100644 install(new numpunct_byname(name_)); #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS install(new numpunct_byname(name_)); -@@ -297,6 +293,10 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP +@@ -293,6 +289,10 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS install(new messages_byname(name_)); #endif @@ -56,5 +56,5 @@ index 2234784769dd..d69e8c43a467 100644 } catch (...) -- -2.35.1.windows.2 +2.37.0.windows.1 diff --git a/recipe/patches/0004-custom-error-message-for-old-sdk.patch b/recipe/patches/0004-custom-error-message-for-old-sdk.patch index f76b4d68..2853cf1a 100644 --- a/recipe/patches/0004-custom-error-message-for-old-sdk.patch +++ b/recipe/patches/0004-custom-error-message-for-old-sdk.patch @@ -1,57 +1,59 @@ -From 494752e4a46bdeb17cc044b7adbccab0ec39f126 Mon Sep 17 00:00:00 2001 +From e12f83758f55620a5bb340c3f9acdf352c6347f9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Dec 2021 19:28:35 -0800 Subject: [PATCH 4/4] custom error message for old sdk --- - libcxx/include/__availability | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + libcxx/include/__availability | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libcxx/include/__availability b/libcxx/include/__availability -index 4652a6fd91b4..88cefa115bb0 100644 +index 72ff663334d3..00c53b94097f 100644 --- a/libcxx/include/__availability +++ b/libcxx/include/__availability -@@ -152,7 +152,7 @@ +@@ -175,7 +175,7 @@ #elif defined(__APPLE__) # define _LIBCPP_AVAILABILITY_SHARED_MUTEX \ -- __attribute__((availability(macosx,strict,introduced=10.12))) \ -+ __attribute__((availability(macosx,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ +- __attribute__((availability(macos,strict,introduced=10.12))) \ ++ __attribute__((availability(macos,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ __attribute__((availability(ios,strict,introduced=10.0))) \ __attribute__((availability(tvos,strict,introduced=10.0))) \ __attribute__((availability(watchos,strict,introduced=3.0))) -@@ -165,7 +165,7 @@ - # endif - +@@ -191,7 +191,7 @@ + // macOS and iOS versions, so the version mismatch between macOS and others + // is intended. # define _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS \ -- __attribute__((availability(macosx,strict,introduced=10.13))) \ -+ __attribute__((availability(macosx,strict,introduced=10.13,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ - __attribute__((availability(ios,strict,introduced=11.0))) \ - __attribute__((availability(tvos,strict,introduced=11.0))) \ - __attribute__((availability(watchos,strict,introduced=4.0))) -@@ -175,12 +175,13 @@ +- __attribute__((availability(macos,strict,introduced=10.13))) \ ++ __attribute__((availability(macos,strict,introduced=10.13,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ + __attribute__((availability(ios,strict,introduced=12.0))) \ + __attribute__((availability(tvos,strict,introduced=12.0))) \ + __attribute__((availability(watchos,strict,introduced=5.0))) +@@ -201,13 +201,13 @@ _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS # define _LIBCPP_AVAILABILITY_UNCAUGHT_EXCEPTIONS \ -- __attribute__((availability(macosx,strict,introduced=10.12))) \ -+ __attribute__((availability(macosx,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ +- __attribute__((availability(macos,strict,introduced=10.12))) \ ++ __attribute__((availability(macos,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ __attribute__((availability(ios,strict,introduced=10.0))) \ __attribute__((availability(tvos,strict,introduced=10.0))) \ __attribute__((availability(watchos,strict,introduced=3.0))) # define _LIBCPP_AVAILABILITY_SIZED_NEW_DELETE \ -+ __attribute__((availability(macosx,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ - __attribute__((availability(macosx,strict,introduced=10.12))) \ +- __attribute__((availability(macos,strict,introduced=10.12))) \ ++ __attribute__((availability(macos,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ __attribute__((availability(ios,strict,introduced=10.0))) \ __attribute__((availability(tvos,strict,introduced=10.0))) \ -@@ -202,6 +203,7 @@ + __attribute__((availability(watchos,strict,introduced=3.0))) +@@ -228,7 +228,7 @@ __attribute__((availability(ios,strict,introduced=7.0))) # define _LIBCPP_AVAILABILITY_FILESYSTEM \ -+ __attribute__((availability(macosx,strict,introduced=10.15,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ - __attribute__((availability(macosx,strict,introduced=10.15))) \ +- __attribute__((availability(macos,strict,introduced=10.15))) \ ++ __attribute__((availability(macos,strict,introduced=10.15,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ __attribute__((availability(ios,strict,introduced=13.0))) \ __attribute__((availability(tvos,strict,introduced=13.0))) \ + __attribute__((availability(watchos,strict,introduced=6.0))) -- -2.35.1.windows.2 +2.37.0.windows.1 From bd11e012464c5b283cd6ac2aaedff396b2e3d12f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 12 Aug 2022 15:20:05 +0200 Subject: [PATCH 24/34] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.08.11.23.35.06 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 84d4f421..8032e967 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e4b57e48..1c16effb 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 8c117a4e..a6232952 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.14' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3e126806..64077b1f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,9 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: From fc0a294e1793510616c018f70fdb9d9d1badc3de Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 12 Aug 2022 15:39:50 +0200 Subject: [PATCH 25/34] disable benchmarks --- recipe/build.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 0569e7c7..4eb4f329 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -20,8 +20,9 @@ if [[ "$target_platform" != osx-* ]]; then cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ + -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ + -DLIBCXX_INCLUDE_DOCS=OFF \ + -DLIBCXX_INCLUDE_TESTS=OFF \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ ../libcxx @@ -56,8 +57,9 @@ if [[ "$target_platform" != osx-* ]]; then -DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$SRC_DIR/libcxxabi/include \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=$PREFIX/lib \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ + -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ + -DLIBCXX_INCLUDE_DOCS=OFF \ + -DLIBCXX_INCLUDE_TESTS=OFF \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ ../libcxx @@ -73,14 +75,15 @@ else cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_SYSROOT=$CONDA_BUILD_SYSROOT \ -DLIBCXX_CXX_ABI=libcxxabi \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${CONDA_BUILD_SYSROOT}/usr/include \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=${CONDA_BUILD_SYSROOT}/usr/lib \ - -DCMAKE_OSX_SYSROOT=$CONDA_BUILD_SYSROOT \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLVM_INCLUDE_DOCS=OFF \ -DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=ON \ -DLIBCXX_ENABLE_VENDOR_AVAILABILITY_ANNOTATIONS=ON \ + -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ + -DLIBCXX_INCLUDE_DOCS=OFF \ + -DLIBCXX_INCLUDE_TESTS=OFF \ ../libcxx make -j${CPU_COUNT} VERBOSE=1 From 24f496bb8526356e9fe4f6c1cd847eff0d855ce3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 12 Aug 2022 16:11:22 +0200 Subject: [PATCH 26/34] add patch for compat with old glibc --- recipe/meta.yaml | 1 + .../0001-libcxxabi-10.9-compatibility.patch | 2 +- ...002-Support-legacy-standalone-builds.patch | 2 +- ...03-Fix-ABI-compatibility-with-system.patch | 2 +- ...004-custom-error-message-for-old-sdk.patch | 2 +- ...05-disable-timespec-due-to-old-glibc.patch | 35 +++++++++++++++++++ 6 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 recipe/patches/0005-disable-timespec-due-to-old-glibc.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6846dedc..32601ff1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ source: # See https://lists.llvm.org/pipermail/libcxx-dev/2021-July/001172.html - patches/0003-Fix-ABI-compatibility-with-system.patch - patches/0004-custom-error-message-for-old-sdk.patch + - patches/0005-disable-timespec-due-to-old-glibc.patch build: number: 0 diff --git a/recipe/patches/0001-libcxxabi-10.9-compatibility.patch b/recipe/patches/0001-libcxxabi-10.9-compatibility.patch index 9796aa93..0ba4d797 100644 --- a/recipe/patches/0001-libcxxabi-10.9-compatibility.patch +++ b/recipe/patches/0001-libcxxabi-10.9-compatibility.patch @@ -1,7 +1,7 @@ From a26ecf9b6621c6d896cf9b757e27b9baa15bc12f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 8 Aug 2020 15:52:31 +0000 -Subject: [PATCH 1/4] libcxxabi 10.9 compatibility +Subject: [PATCH 1/5] libcxxabi 10.9 compatibility --- libcxx/src/support/runtime/exception_libcxxabi.ipp | 4 ---- diff --git a/recipe/patches/0002-Support-legacy-standalone-builds.patch b/recipe/patches/0002-Support-legacy-standalone-builds.patch index 3b27c2b5..8fe51da5 100644 --- a/recipe/patches/0002-Support-legacy-standalone-builds.patch +++ b/recipe/patches/0002-Support-legacy-standalone-builds.patch @@ -1,7 +1,7 @@ From 130d354336d74b40606c5ae45ef27bf44e97a449 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 18 May 2021 19:51:28 -0500 -Subject: [PATCH 2/4] Support legacy standalone builds +Subject: [PATCH 2/5] Support legacy standalone builds --- libcxx/src/CMakeLists.txt | 17 +++++++++++++++++ diff --git a/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch b/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch index e74d0c4f..4cf2d836 100644 --- a/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch +++ b/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch @@ -1,7 +1,7 @@ From edebfefbfca06af0dd5cb1472ce462cd27f10b71 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 13 Jul 2021 01:57:06 -0500 -Subject: [PATCH 3/4] Fix ABI compatibility with system +Subject: [PATCH 3/5] Fix ABI compatibility with system --- libcxx/src/locale.cpp | 16 ++++++++-------- diff --git a/recipe/patches/0004-custom-error-message-for-old-sdk.patch b/recipe/patches/0004-custom-error-message-for-old-sdk.patch index 2853cf1a..4c13dc4f 100644 --- a/recipe/patches/0004-custom-error-message-for-old-sdk.patch +++ b/recipe/patches/0004-custom-error-message-for-old-sdk.patch @@ -1,7 +1,7 @@ From e12f83758f55620a5bb340c3f9acdf352c6347f9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Dec 2021 19:28:35 -0800 -Subject: [PATCH 4/4] custom error message for old sdk +Subject: [PATCH 4/5] custom error message for old sdk --- libcxx/include/__availability | 10 +++++----- diff --git a/recipe/patches/0005-disable-timespec-due-to-old-glibc.patch b/recipe/patches/0005-disable-timespec-due-to-old-glibc.patch new file mode 100644 index 00000000..126a52ea --- /dev/null +++ b/recipe/patches/0005-disable-timespec-due-to-old-glibc.patch @@ -0,0 +1,35 @@ +From dec2f8f013d288d80a161877155dfdeb17bbb0b3 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Fri, 12 Aug 2022 16:09:52 +0200 +Subject: [PATCH 5/5] disable timespec due to old glibc + +see https://github.com/llvm/llvm-project/commit/21f73d5826fb5024a27eaacafadfa316f58949c5 +--- + libcxx/include/ctime | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libcxx/include/ctime b/libcxx/include/ctime +index 0c6e4dfd6f98..c96127591432 100644 +--- a/libcxx/include/ctime ++++ b/libcxx/include/ctime +@@ -59,7 +59,7 @@ using ::clock_t _LIBCPP_USING_IF_EXISTS; + using ::size_t _LIBCPP_USING_IF_EXISTS; + using ::time_t _LIBCPP_USING_IF_EXISTS; + using ::tm _LIBCPP_USING_IF_EXISTS; +-#if _LIBCPP_STD_VER > 14 ++#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_TIMESPEC_GET) + using ::timespec _LIBCPP_USING_IF_EXISTS; + #endif + using ::clock _LIBCPP_USING_IF_EXISTS; +@@ -71,7 +71,7 @@ using ::ctime _LIBCPP_USING_IF_EXISTS; + using ::gmtime _LIBCPP_USING_IF_EXISTS; + using ::localtime _LIBCPP_USING_IF_EXISTS; + using ::strftime _LIBCPP_USING_IF_EXISTS; +-#if _LIBCPP_STD_VER > 14 ++#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_TIMESPEC_GET) + using ::timespec_get _LIBCPP_USING_IF_EXISTS; + #endif + +-- +2.37.0.windows.1 + From 04e84572f374cb4537866262293689aa40293e24 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Thu, 25 Aug 2022 19:25:54 +0200 Subject: [PATCH 27/34] Added link to documentation for path error message on old osx sdk --- ...004-custom-error-message-for-old-sdk.patch | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/recipe/patches/0004-custom-error-message-for-old-sdk.patch b/recipe/patches/0004-custom-error-message-for-old-sdk.patch index f76b4d68..a4806e2b 100644 --- a/recipe/patches/0004-custom-error-message-for-old-sdk.patch +++ b/recipe/patches/0004-custom-error-message-for-old-sdk.patch @@ -1,14 +1,5 @@ -From 494752e4a46bdeb17cc044b7adbccab0ec39f126 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Wed, 29 Dec 2021 19:28:35 -0800 -Subject: [PATCH 4/4] custom error message for old sdk - ---- - libcxx/include/__availability | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - diff --git a/libcxx/include/__availability b/libcxx/include/__availability -index 4652a6fd91b4..88cefa115bb0 100644 +index 4652a6fd91b4..d468f3c129ea 100644 --- a/libcxx/include/__availability +++ b/libcxx/include/__availability @@ -152,7 +152,7 @@ @@ -44,7 +35,7 @@ index 4652a6fd91b4..88cefa115bb0 100644 __attribute__((availability(macosx,strict,introduced=10.12))) \ __attribute__((availability(ios,strict,introduced=10.0))) \ __attribute__((availability(tvos,strict,introduced=10.0))) \ -@@ -202,6 +203,7 @@ +@@ -202,12 +203,13 @@ __attribute__((availability(ios,strict,introduced=7.0))) # define _LIBCPP_AVAILABILITY_FILESYSTEM \ @@ -52,6 +43,10 @@ index 4652a6fd91b4..88cefa115bb0 100644 __attribute__((availability(macosx,strict,introduced=10.15))) \ __attribute__((availability(ios,strict,introduced=13.0))) \ __attribute__((availability(tvos,strict,introduced=13.0))) \ --- -2.35.1.windows.2 - + __attribute__((availability(watchos,strict,introduced=6.0))) + # define _LIBCPP_AVAILABILITY_FILESYSTEM_PUSH \ +- _Pragma("clang attribute push(__attribute__((availability(macosx,strict,introduced=10.15))), apply_to=any(function,record))") \ ++ _Pragma("clang attribute push(__attribute__((availability(macosx,strict,introduced=10.15,message=\"see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk\"))), apply_to=any(function,record))") \ + _Pragma("clang attribute push(__attribute__((availability(ios,strict,introduced=13.0))), apply_to=any(function,record))") \ + _Pragma("clang attribute push(__attribute__((availability(tvos,strict,introduced=13.0))), apply_to=any(function,record))") \ + _Pragma("clang attribute push(__attribute__((availability(watchos,strict,introduced=6.0))), apply_to=any(function,record))") From 030cd29c446ffb8df156629f77748e567b9ce54c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 25 Aug 2022 17:44:49 +0000 Subject: [PATCH 28/34] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.08.25.16.47.48 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 84d4f421..8032e967 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 8c117a4e..55417c22 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '13' +- '14' dummy_var: - '0' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3e126806..90b1c601 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '13' +- '14' dummy_var: - '1' macos_machine: From 5f71a553b32e4669679b83260a9e6536be07bccb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Aug 2022 20:11:59 +0200 Subject: [PATCH 29/34] update patch --- .../patches/0001-libcxxabi-10.9-compatibility.patch | 2 +- .../0002-Support-legacy-standalone-builds.patch | 2 +- .../0003-Fix-ABI-compatibility-with-system.patch | 2 +- .../0004-custom-error-message-for-old-sdk.patch | 12 ++++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/recipe/patches/0001-libcxxabi-10.9-compatibility.patch b/recipe/patches/0001-libcxxabi-10.9-compatibility.patch index e40502d2..de422951 100644 --- a/recipe/patches/0001-libcxxabi-10.9-compatibility.patch +++ b/recipe/patches/0001-libcxxabi-10.9-compatibility.patch @@ -24,5 +24,5 @@ index ee15e437e602..8933a9b747a6 100644 } // namespace std -- -2.35.1.windows.2 +2.37.0.windows.1 diff --git a/recipe/patches/0002-Support-legacy-standalone-builds.patch b/recipe/patches/0002-Support-legacy-standalone-builds.patch index 8c89223f..d516e92a 100644 --- a/recipe/patches/0002-Support-legacy-standalone-builds.patch +++ b/recipe/patches/0002-Support-legacy-standalone-builds.patch @@ -36,5 +36,5 @@ index 12dcdf954405..d2c33141c77b 100644 # Generate a linker script in place of a libc++.so symlink. -- -2.35.1.windows.2 +2.37.0.windows.1 diff --git a/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch b/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch index 45d2aa8c..5bcbaf92 100644 --- a/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch +++ b/recipe/patches/0003-Fix-ABI-compatibility-with-system.patch @@ -56,5 +56,5 @@ index 2234784769dd..d69e8c43a467 100644 } catch (...) -- -2.35.1.windows.2 +2.37.0.windows.1 diff --git a/recipe/patches/0004-custom-error-message-for-old-sdk.patch b/recipe/patches/0004-custom-error-message-for-old-sdk.patch index a4806e2b..23f85a14 100644 --- a/recipe/patches/0004-custom-error-message-for-old-sdk.patch +++ b/recipe/patches/0004-custom-error-message-for-old-sdk.patch @@ -1,3 +1,12 @@ +From 25c19333d6ba0a83341fdcadf30b4d9e84227766 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Wed, 29 Dec 2021 19:28:35 -0800 +Subject: [PATCH 4/4] custom error message for old sdk + +--- + libcxx/include/__availability | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + diff --git a/libcxx/include/__availability b/libcxx/include/__availability index 4652a6fd91b4..d468f3c129ea 100644 --- a/libcxx/include/__availability @@ -50,3 +59,6 @@ index 4652a6fd91b4..d468f3c129ea 100644 _Pragma("clang attribute push(__attribute__((availability(ios,strict,introduced=13.0))), apply_to=any(function,record))") \ _Pragma("clang attribute push(__attribute__((availability(tvos,strict,introduced=13.0))), apply_to=any(function,record))") \ _Pragma("clang attribute push(__attribute__((availability(watchos,strict,introduced=6.0))), apply_to=any(function,record))") +-- +2.37.0.windows.1 + From f3b1e0ff5437902a93c62ed7a373e0b4cc3263a9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Aug 2022 20:13:08 +0200 Subject: [PATCH 30/34] remove now-obsolete compiler spec in cbc --- recipe/conda_build_config.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index cdb43d4c..119c6250 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,13 +1,7 @@ -c_compiler: +c_compiler: # [osx] - clang_bootstrap # [osx] - - gcc # [linux] - - vs2019 # [win] -cxx_compiler: +cxx_compiler: # [osx] - clang_bootstrap # [osx] - - gxx # [linux] - - vs2019 # [win] -vc: - - 14 # libcxx only supports the last released GCC version, see # https://releases.llvm.org/13.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support From d8914f083cf074e66c3ebad002dceb304f9fcb7a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 25 Aug 2022 23:12:16 +0200 Subject: [PATCH 31/34] gotta catch 'em all --- ...004-custom-error-message-for-old-sdk.patch | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/recipe/patches/0004-custom-error-message-for-old-sdk.patch b/recipe/patches/0004-custom-error-message-for-old-sdk.patch index 23f85a14..a7c3d768 100644 --- a/recipe/patches/0004-custom-error-message-for-old-sdk.patch +++ b/recipe/patches/0004-custom-error-message-for-old-sdk.patch @@ -1,14 +1,14 @@ -From 25c19333d6ba0a83341fdcadf30b4d9e84227766 Mon Sep 17 00:00:00 2001 +From 16965b0055d69de5c47fd68a6b8cfef772d863e7 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Dec 2021 19:28:35 -0800 Subject: [PATCH 4/4] custom error message for old sdk --- - libcxx/include/__availability | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) + libcxx/include/__availability | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libcxx/include/__availability b/libcxx/include/__availability -index 4652a6fd91b4..d468f3c129ea 100644 +index 4652a6fd91b4..4e6833f371a3 100644 --- a/libcxx/include/__availability +++ b/libcxx/include/__availability @@ -152,7 +152,7 @@ @@ -29,7 +29,7 @@ index 4652a6fd91b4..d468f3c129ea 100644 __attribute__((availability(ios,strict,introduced=11.0))) \ __attribute__((availability(tvos,strict,introduced=11.0))) \ __attribute__((availability(watchos,strict,introduced=4.0))) -@@ -175,12 +175,13 @@ +@@ -175,13 +175,13 @@ _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS # define _LIBCPP_AVAILABILITY_UNCAUGHT_EXCEPTIONS \ @@ -40,16 +40,17 @@ index 4652a6fd91b4..d468f3c129ea 100644 __attribute__((availability(watchos,strict,introduced=3.0))) # define _LIBCPP_AVAILABILITY_SIZED_NEW_DELETE \ +- __attribute__((availability(macosx,strict,introduced=10.12))) \ + __attribute__((availability(macosx,strict,introduced=10.12,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ - __attribute__((availability(macosx,strict,introduced=10.12))) \ __attribute__((availability(ios,strict,introduced=10.0))) \ __attribute__((availability(tvos,strict,introduced=10.0))) \ -@@ -202,12 +203,13 @@ + __attribute__((availability(watchos,strict,introduced=3.0))) +@@ -202,12 +202,12 @@ __attribute__((availability(ios,strict,introduced=7.0))) # define _LIBCPP_AVAILABILITY_FILESYSTEM \ +- __attribute__((availability(macosx,strict,introduced=10.15))) \ + __attribute__((availability(macosx,strict,introduced=10.15,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ - __attribute__((availability(macosx,strict,introduced=10.15))) \ __attribute__((availability(ios,strict,introduced=13.0))) \ __attribute__((availability(tvos,strict,introduced=13.0))) \ __attribute__((availability(watchos,strict,introduced=6.0))) @@ -59,6 +60,15 @@ index 4652a6fd91b4..d468f3c129ea 100644 _Pragma("clang attribute push(__attribute__((availability(ios,strict,introduced=13.0))), apply_to=any(function,record))") \ _Pragma("clang attribute push(__attribute__((availability(tvos,strict,introduced=13.0))), apply_to=any(function,record))") \ _Pragma("clang attribute push(__attribute__((availability(watchos,strict,introduced=6.0))), apply_to=any(function,record))") +@@ -230,7 +230,7 @@ + __attribute__((unavailable)) + + # define _LIBCPP_AVAILABILITY_SYNC \ +- __attribute__((availability(macosx,strict,introduced=11.0))) \ ++ __attribute__((availability(macosx,strict,introduced=11.0,message="see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk"))) \ + __attribute__((availability(ios,strict,introduced=14.0))) \ + __attribute__((availability(tvos,strict,introduced=14.0))) \ + __attribute__((availability(watchos,strict,introduced=7.0))) -- 2.37.0.windows.1 From 2da87bc2c52edb4357d0c75dde86d6648fcc6f5d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 29 Aug 2022 18:04:39 +0200 Subject: [PATCH 32/34] add test for correctly adding links for osx-sdk Co-Authored-By: Isuru Fernando --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2427f796..33639744 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -69,6 +69,11 @@ outputs: - test -f $PREFIX/include/c++/v1/iterator # [unix] - bash compile_test.sh # [unix] - compile_test.bat # [win] + # make sure we inserted link to our docs wherever it is necessary; + # i.e. everywhere there's a string "availability(macosx,...,introduced=)" for osx version >10.9 + # 'grep -v' inverts the match but returns non-zero exit code no lines are returned; so we use 'wc -l'; + # we want to have zero lines that don't either: contain the link or are for 10.9 + - if [ 0 -eq $(cat ${PREFIX}/include/c++/v1/__availability | grep "availability(macosx" | grep -vE "(conda-forge|10.9)" | wc -l) ]; then exit 0; else exit 1; fi # [osx] # !!!!!!!!!!!! README !!!!!!!!!!!!!!!!!! # we do not ship libcxxabi on OSX - this breaks exception passing - if [ -f $PREFIX/lib/libc++abi.dylib ]; then exit 1; fi # [osx] From 12cd727882aae01aca97ec100c1d5b1785d8d1a8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 30 Aug 2022 00:36:47 +0200 Subject: [PATCH 33/34] adapt to new os name --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 17d913bc..a28f97bc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -71,10 +71,10 @@ outputs: - bash compile_test.sh # [unix] - compile_test.bat # [win] # make sure we inserted link to our docs wherever it is necessary; - # i.e. everywhere there's a string "availability(macosx,...,introduced=)" for osx version >10.9 - # 'grep -v' inverts the match but returns non-zero exit code no lines are returned; so we use 'wc -l'; + # i.e. everywhere there's a string "availability(macos,...,introduced=)" for osx version >10.9; + # 'grep -v' inverts the match but returns non-zero exit code if no lines are returned; so we use 'wc -l'; # we want to have zero lines that don't either: contain the link or are for 10.9 - - if [ 0 -eq $(cat ${PREFIX}/include/c++/v1/__availability | grep "availability(macosx" | grep -vE "(conda-forge|10.9)" | wc -l) ]; then exit 0; else exit 1; fi # [osx] + - if [ 0 -eq $(cat ${PREFIX}/include/c++/v1/__availability | grep "availability(macos" | grep -vE "(conda-forge|10.9)" | wc -l) ]; then exit 0; else exit 1; fi # [osx] # !!!!!!!!!!!! README !!!!!!!!!!!!!!!!!! # we do not ship libcxxabi on OSX - this breaks exception passing - if [ -f $PREFIX/lib/libc++abi.dylib ]; then exit 1; fi # [osx] From f1ae7ea9f3b081e09642afddbe8e35d031fefeb5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 31 Aug 2022 08:49:09 +0200 Subject: [PATCH 34/34] bump to 15.0.0.rc3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a28f97bc..b57ff547 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.0.rc2" %} +{% set version = "15.0.0.rc3" %} package: name: libcxx_and_libcxxabi @@ -6,7 +6,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: 00211c8789009610f592d3bbbd0f328d011c26935aabaa2628ec4d8c3cc9b647 + sha256: 36b3c3cb2baa598192f11a1e00634401a35447b83a2bc12289bb2dcc3cc73520 patches: - patches/0001-libcxxabi-10.9-compatibility.patch # [osx and x86_64] - patches/0002-Support-legacy-standalone-builds.patch
linux_64 - - variant + + variant
osx_64 - - variant + + variant
osx_arm64 - - variant + + variant