Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
fa1d837
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] Mar 15, 2024
7bc4b08
Merge remote-tracking branch 'upstream/main' into 17
h-vetinari Apr 21, 2024
8843e25
remove rc-channel sources & targets
h-vetinari Sep 26, 2023
de76323
remove obsolete travis configuration
h-vetinari Sep 26, 2023
d3f9842
alphabetize keys in conda-forge.yml
h-vetinari Sep 26, 2023
aaf669c
libcxx 17.0.1
h-vetinari Sep 26, 2023
91f0758
updated v17.0.2
regro-cf-autotick-bot Oct 3, 2023
2bf10e9
libcxx 17.0.6
h-vetinari Mar 6, 2024
2db1dfa
do stdlib transformation
h-vetinari Apr 21, 2024
c387396
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and co…
h-vetinari Apr 21, 2024
35b0baf
add testing against clang 17 & 18
h-vetinari Apr 21, 2024
83f6f06
Merge pull request #131 from h-vetinari/17
h-vetinari May 6, 2024
98bf29b
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] May 12, 2024
34c924b
[ci skip] update abi_migration_branches
h-vetinari Jun 12, 2024
e5692ea
resort cbc
h-vetinari Jun 20, 2024
9bb215d
build for two different ABIs on osx (before/after macOS 12.0)
h-vetinari Jun 20, 2024
38db1a3
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
h-vetinari Jun 20, 2024
4ebcd16
manual override: use old macOS image for pre-12 system ABI
h-vetinari Jun 20, 2024
f3d578d
bump build number
h-vetinari Jun 20, 2024
1cf8aae
update reference for ABI patch
h-vetinari May 26, 2024
97f8524
publish pre-12 sys_abi builds to separate label
h-vetinari Jun 22, 2024
8e10814
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
h-vetinari Jun 22, 2024
b3f5180
Merge pull request #154 from h-vetinari/double_abi
h-vetinari Jun 22, 2024
360f04c
lower deployment target even for sys_abi=post-12
h-vetinari Jun 29, 2024
c73230b
skip libcxx downstream tests on pre-12 sys_abi due to deleted image
h-vetinari Jun 29, 2024
d685499
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
h-vetinari Jun 29, 2024
106153d
expand skip for old sys_abi to entire test section
h-vetinari Jun 29, 2024
922f047
Merge pull request #158 from h-vetinari/abi
isuruf Jun 29, 2024
ab9956b
switch to github-generated sources
h-vetinari Jun 20, 2024
f03c8d4
libcxx v18.1.8
h-vetinari Jun 20, 2024
a89582a
rebase patches
h-vetinari May 6, 2024
4e94893
bump GCC version
h-vetinari May 6, 2024
1de04b0
unpin clang compilers
h-vetinari May 26, 2024
c956786
disable a mis-detected feature that's not available on current macOS
h-vetinari Jun 22, 2024
7af4a4d
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
h-vetinari Jun 22, 2024
8ab8873
avoid gcc linker tripping over -nostdlib++
h-vetinari Jun 22, 2024
df395e7
help correctly link to dl/pthreads on linux
h-vetinari Jun 22, 2024
21c5030
package libunwind as well
h-vetinari Jun 22, 2024
a09b2d6
drop testing against clang<15
h-vetinari Jun 29, 2024
7a91db1
remove patch for pre-C11 compat
h-vetinari Jun 29, 2024
97b4c4f
ensure correct run-exports for libcxxabi
h-vetinari Jul 1, 2024
666ff9d
turn libunwind into linux-only output
h-vetinari Jul 1, 2024
a3a0b87
point to system libunwind on osx
h-vetinari Jul 1, 2024
be6768f
set LIBCXX_HARDENING_MODE="fast"
h-vetinari Jul 1, 2024
c87c648
Fix MACOSX_DEPLOYMENT_TARGET
isuruf Jul 3, 2024
5fc7d1b
rerender
isuruf Jul 3, 2024
a879076
Fix zip_keys
isuruf Jul 3, 2024
e9213a5
Update MACOSX_SDK_VERSION
isuruf Jul 3, 2024
560f2d7
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
Jul 3, 2024
e7a3470
Merge pull request #159 from isuruf/macosx-deployment-target
h-vetinari Jul 3, 2024
e73c219
Merge remote-tracking branch 'upstream/main' into 18
h-vetinari Jul 3, 2024
6d71464
add more context to patches; merge fixes for stray `-nostdlib++`
h-vetinari Jul 8, 2024
f2935e0
Merge pull request #155 from h-vetinari/18
isuruf Jul 10, 2024
6777c33
Link against the system's libunwind
jjerphan Jul 23, 2024
1c26550
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
Jul 23, 2024
dd0bfc1
update patch for pthreads workaround; drop legacy patch
h-vetinari Jul 23, 2024
7458a22
Merge pull request #167 from jjerphan/link-against-systems-libunwind
h-vetinari Jul 28, 2024
20ba444
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Jul 28, 2024
b9b94fb
Revert "remove rc-channel sources & targets"
h-vetinari Jul 28, 2024
b7e5421
libcxx v19.1.0.rc1
h-vetinari Jul 28, 2024
fd137ee
rebase patches
h-vetinari Jul 28, 2024
5b33088
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
h-vetinari Jul 28, 2024
b2d3421
use GCC 14 on linux
h-vetinari Jul 28, 2024
e3a62af
drop clang 15 testing
h-vetinari Jul 28, 2024
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
4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

20 changes: 15 additions & 5 deletions .azure-pipelines/azure-pipelines-osx.yml

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

11 changes: 9 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge llvm_rc
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '14'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.14'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge libcxx_macos_lt_12
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '*'
dummy_var:
- '0'
macos_machine:
- x86_64-apple-darwin13.4.0
sys_abi:
- pre-12
target_platform:
- osx-64
zip_keys:
- - sys_abi
- channel_targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,26 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.14'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge llvm_rc
- conda-forge main
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '15'
- '*'
dummy_var:
- '0'
macos_machine:
- x86_64-apple-darwin13.4.0
openturns:
- '1.20'
sys_abi:
- post-12
target_platform:
- osx-64
zip_keys:
- - sys_abi
- channel_targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge libcxx_macos_lt_12
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '*'
dummy_var:
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
sys_abi:
- pre-12
target_platform:
- osx-arm64
zip_keys:
- - sys_abi
- channel_targets
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge llvm_rc
- conda-forge main
cxx_compiler:
- clang_bootstrap
cxx_compiler_version:
- '15'
- '*'
dummy_var:
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
openturns:
- '1.20'
sys_abi:
- post-12
target_platform:
- osx-arm64
zip_keys:
- - sys_abi
- channel_targets
4 changes: 2 additions & 2 deletions .gitattributes

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

25 changes: 23 additions & 2 deletions .gitignore

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

22 changes: 15 additions & 7 deletions .scripts/build_steps.sh

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

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

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

9 changes: 9 additions & 0 deletions .scripts/run_docker_build.sh

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

26 changes: 20 additions & 6 deletions .scripts/run_osx_build.sh

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

Loading