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

switch linux to use GCC 11.2.0, switch osx to use gfortran 11.2.0 #221

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

switch linux to use GCC 11.2.0, switch osx to use gfortran 11.2.0 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4042779
switch linux to use GCC 11.2.0, switch osx to use gfortran 11.2.0
katietz May 23, 2022
88e0f1f
python-3.9: update pin
katietz Jun 1, 2022
30f93f4
gcc_toolchain: fix s390x vector issue
katietz Jun 1, 2022
c7ea0dc
protobuf: update pin
katietz Jun 8, 2022
b7bd0be
protobuf-3.11.2: add version pin
katietz Jun 8, 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
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6549,3 +6549,7 @@
path = numpy-1.21-feedstock
url = ../numpy-feedstock
branch = numpy121
[submodule "protobuf-3.11.2-feedstock"]
path = protobuf-3.11.2-feedstock
url = ../protobuf-feedstock
branch = main-3.11.2
36 changes: 8 additions & 28 deletions conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,16 @@ cairo:
- 1.14 # [not (s390x or aarch64 or (osx and arm64))]
- 1.16 # [s390x or aarch64 or (osx and arm64)]
c_compiler:
- gcc # [linux and aarch64]
- gcc # [linux]
- clang # [osx]
- vs2017 # [win]
cxx_compiler:
- gxx # [linux and aarch64]
- gxx # [linux]
- clangxx # [osx]
- vs2017 # [win]
fortran_compiler:
- gfortran # [(linux and aarch64) or (osx and arm64)]
- gfortran # [linux or osx]
- intel-fortran # [win]
fortran_compiler_version:
- 2019.0.0 # [win]
- 11.1.0 # [osx and arm64]
# matrix on linux, because the ABI breaks at GCC 8
- 7.5.0 # [linux and not (s390x or aarch64 or ppc64le)]
- 8.4.0 # [linux and not (s390x or aarch64 or ppc64le)]
- 7.3.0 # [linux and ppc64le]
- 8.2.0 # [linux and ppc64le]
- 7.5.0 # [linux and s390x]
- 8.4.0 # [linux and s390x]
- 10.2.0 # [linux and aarch64]
- 10.2.0 # [linux and aarch64]
m2w64_c_compiler: # [win]
- m2w64-toolchain # [win]
m2w64_cxx_compiler: # [win]
Expand All @@ -62,22 +50,14 @@ VERBOSE_CM:
cran_mirror:
- https://mran.microsoft.com/snapshot/2018-01-01
c_compiler_version: # [linux or osx]
- 7.5.0 # [linux and not (s390x or aarch64 or ppc64le)]
- 7.3.0 # [linux and ppc64le]
- 7.5.0 # [linux and s390x]
- 10.2.0 # [linux and aarch64]
- 11.2.0 # [linux]
- 12 # [osx]
cxx_compiler_version: # [linux or osx]
- 7.5.0 # [linux and not (s390x or aarch64 or ppc64le)]
- 7.3.0 # [linux and ppc64le]
- 7.5.0 # [linux and s390x]
- 10.2.0 # [linux and aarch64]
- 11.2.0 # [linux]
- 12 # [osx]
fortran_compiler_version: # [linux]
- 7.5.0 # [linux and not (s390x or aarch64 or ppc64le)]
- 7.3.0 # [linux and ppc64le]
- 7.5.0 # [linux and s390x]
- 10.2.0 # [linux and aarch64]
fortran_compiler_version:
- 2019.0.0 # [win]
- 11.2.0 # [osx or linux]
clang_variant:
- clang
cyrus_sasl:
Expand Down
2 changes: 1 addition & 1 deletion gcc_toolchain-feedstock
Open in desktop
Submodule gcc_toolchain-feedstock updated 4 files
+3 −1 recipe/build_scripts/kernel_headers.sh
+1 −1 recipe/conda_build_config.yaml
+6 −4 recipe/decompress.sh
+3 −2 recipe/meta.yaml
1 change: 1 addition & 0 deletions protobuf-3.11.2-feedstock
Open in desktop
Submodule protobuf-3.11.2-feedstock added at 349bb9
2 changes: 1 addition & 1 deletion protobuf-feedstock
Open in desktop
Submodule protobuf-feedstock updated 0 files
2 changes: 1 addition & 1 deletion python-3.9-feedstock
Open in desktop
Submodule python-3.9-feedstock updated 2 files
+2 −2 recipe/build_base.sh
+1 −1 recipe/meta.yaml