Skip to content

libcxx v13.0.1 (redux) #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isuruf merged 11 commits into from
Mar 12, 2022
Merged

libcxx v13.0.1 (redux) #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
08936da
updated v13.0.0
regro-cf-autotick-bot Oct 1, 2021
8358cf3
normalize patches
h-vetinari Nov 25, 2021
891ce4a
rebase patches against 13.0.0 (define-guard changed name)
h-vetinari Nov 25, 2021
d6f8167
add myself to maintainers
h-vetinari Nov 25, 2021
ae97738
bump GCC to 11, which is minimal support for libcxx 13
h-vetinari Nov 25, 2021
339530e
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.16.2, and co…
h-vetinari Feb 5, 2022
2f67829
bump to 13.0.1
h-vetinari Feb 5, 2022
d212617
point libcxxabi to correct $PREFIX/include
h-vetinari Feb 23, 2022
d81548f
unpin clang on osx
h-vetinari Feb 23, 2022
21a5107
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.17.2, and co…
h-vetinari Feb 23, 2022
451835a
add comment why GCC 11 is necessary
h-vetinari Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion .ci_support/README
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-64
vc:
- '14'
zip_keys:
- - cdt_name
- docker_image
6 changes: 3 additions & 3 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.14'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- 11.1.0
- '12'
dummy_var:
- '0'
macos_machine:
- x86_64-apple-darwin13.4.0
openturns:
- '1.16'
- '1.18'
pin_run_as_build:
openturns:
max_pin: x.x
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
channel_sources:
- conda-forge/label/rust_dev,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- 11.1.0
- '12'
dummy_var:
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
openturns:
- '1.16'
- '1.18'
pin_run_as_build:
openturns:
max_pin: x.x
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 33 additions & 15 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
set -ex

LLVM_PREFIX=$PREFIX

if [[ "$target_platform" == osx-* ]]; then
Expand All @@ -20,6 +22,7 @@ if [[ "$target_platform" != osx-* ]]; then
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_DOCS=OFF \
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
../libcxx

make -j${CPU_COUNT} VERBOSE=1
Expand All @@ -34,9 +37,8 @@ if [[ "$target_platform" != osx-* ]]; then
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DCMAKE_BUILD_TYPE=Release \
-DLIBCXXABI_LIBCXX_PATH=$SRC_DIR/libcxx \
-DLIBCXXABI_LIBCXX_INCLUDES=$SRC_DIR/libcxx/include \
-DLIBCXXABI_LIBCXX_INCLUDES=$PREFIX/include/c++/v1 \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_DOCS=OFF \
..

make -j${CPU_COUNT} VERBOSE=1
Expand All @@ -55,6 +57,7 @@ if [[ "$target_platform" != osx-* ]]; then
-DLIBCXX_CXX_ABI_LIBRARY_PATH=$PREFIX/lib \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_DOCS=OFF \
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
../libcxx

make -j${CPU_COUNT} VERBOSE=1
Expand Down
Loading