Skip to content
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

Jump to bottom

libcxx 15.0.0.rc's #98

Closed
wants to merge 44 commits into from
Closed

libcxx 15.0.0.rc's #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9b68439
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning off CI for ma…
conda-forge-admin Mar 13, 2022
79ad996
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** turning on CI for mas…
conda-forge-admin Mar 13, 2022
f85b0a8
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-admin Mar 13, 2022
7814ff0
updated v14.0.0
regro-cf-autotick-bot Mar 23, 2022
622d42e
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and co…
regro-cf-autotick-bot Mar 23, 2022
0ba6d90
Merge branch 'rc' into 14.0.0_hd52e6c
h-vetinari Apr 28, 2022
b5abc30
remove rc-channels
h-vetinari Apr 28, 2022
001d5fe
add dev_url
h-vetinari Apr 28, 2022
0355b97
align some selectors
h-vetinari Apr 28, 2022
17326f9
remove redundant skip
h-vetinari Apr 28, 2022
203e0d9
set feedstock name
h-vetinari Apr 28, 2022
e6a7a90
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and co…
h-vetinari Apr 28, 2022
4041c95
Merge pull request #85 from regro-cf-autotick-bot/14.0.0_hd52e6c
h-vetinari May 5, 2022
20d17ff
update URL; retrigger CI
h-vetinari May 5, 2022
a246704
updated v14.0.3
regro-cf-autotick-bot May 5, 2022
deaf509
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and co…
regro-cf-autotick-bot May 5, 2022
a79e847
libcxx v14.0.3 (#91)
github-actions[bot] May 5, 2022
0d4fa1b
updated v14.0.4
regro-cf-autotick-bot May 25, 2022
dc4c0a5
libcxx v14.0.4 (#92)
github-actions[bot] May 26, 2022
cf66016
updated v14.0.5
regro-cf-autotick-bot Jun 11, 2022
119e590
MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.20.0, and co…
regro-cf-autotick-bot Jun 11, 2022
8436341
libcxx v14.0.5 (#93)
github-actions[bot] Jun 12, 2022
1afebdc
Keep compiler to use the correct cctools
isuruf Jun 13, 2022
2576301
Keep compiler to use the correct cctools (#95)
github-actions[bot] Jun 13, 2022
b114dff
updated v14.0.6
regro-cf-autotick-bot Jun 25, 2022
1603bbb
MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and co…
regro-cf-autotick-bot Jun 25, 2022
b60c770
libcxx v14.0.6 (#96)
github-actions[bot] Jun 27, 2022
324a23d
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Aug 12, 2022
9d7725a
Revert "remove rc-channels"
h-vetinari Aug 12, 2022
921d461
bump to 15.0.0.rc2
h-vetinari Aug 12, 2022
c956fae
rebase patches
h-vetinari Aug 12, 2022
bd11e01
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
h-vetinari Aug 12, 2022
fc0a294
disable benchmarks
h-vetinari Aug 12, 2022
24f496b
add patch for compat with old glibc
h-vetinari Aug 12, 2022
04e8457
Added link to documentation for path error message on old osx sdk
JohanMabille Aug 25, 2022
030cd29
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
Aug 25, 2022
5f71a55
update patch
h-vetinari Aug 25, 2022
f3b1e0f
remove now-obsolete compiler spec in cbc
h-vetinari Aug 25, 2022
d8914f0
gotta catch 'em all
h-vetinari Aug 25, 2022
2da87bc
add test for correctly adding links for osx-sdk
h-vetinari Aug 29, 2022
3ec9386
Merge pull request #99 from JohanMabille/osx_sdk
h-vetinari Aug 29, 2022
41c0864
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Aug 29, 2022
12cd727
adapt to new os name
h-vetinari Aug 29, 2022
f1ae7ea
bump to 15.0.0.rc3
h-vetinari Aug 31, 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
2 changes: 1 addition & 1 deletion .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.

12 changes: 6 additions & 6 deletions .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.

2 changes: 0 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-64
vc:
- '14'
4 changes: 1 addition & 3 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '12'
- '14'
dummy_var:
- '0'
macos_machine:
Expand All @@ -21,5 +21,3 @@ pin_run_as_build:
max_pin: x.x
target_platform:
- osx-64
vc:
- '14'
4 changes: 1 addition & 3 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '12'
- '14'
dummy_var:
- '1'
macos_machine:
Expand All @@ -19,5 +19,3 @@ pin_run_as_build:
max_pin: x.x
target_platform:
- osx-arm64
vc:
- '14'
3 changes: 2 additions & 1 deletion .circleci/config.yml
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/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/webservices.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
9 changes: 8 additions & 1 deletion .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.

4 changes: 4 additions & 0 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.

30 changes: 22 additions & 8 deletions LICENSE.txt
View file
Open in desktop

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

79 changes: 54 additions & 25 deletions README.md
View file
Open in desktop

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

19 changes: 13 additions & 6 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.

3 changes: 3 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 10 additions & 7 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
Loading