From 404277995500f93a96382825e992822fd7a3bb50 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 23 May 2022 10:26:03 +0200 Subject: [PATCH 1/5] switch linux to use GCC 11.2.0, switch osx to use gfortran 11.2.0 --- conda_build_config.yaml | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 781aadad6..dd5e7bfd0 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -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] @@ -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: From 88e0f1fc470f35ba8964fa8a09c550b2bd1dda4b Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 1 Jun 2022 13:31:07 +0200 Subject: [PATCH 2/5] python-3.9: update pin --- python-3.9-feedstock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-3.9-feedstock b/python-3.9-feedstock index f06591dd2..bdae6e042 160000 --- a/python-3.9-feedstock +++ b/python-3.9-feedstock @@ -1 +1 @@ -Subproject commit f06591dd2ec5edb18c3fc0f785898b2838a39577 +Subproject commit bdae6e042b03311cb3f0962da07b1f3c8306de7a From 30f93f4440c41e968c452ce4e02800cd134eb673 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 1 Jun 2022 13:54:57 +0200 Subject: [PATCH 3/5] gcc_toolchain: fix s390x vector issue --- gcc_toolchain-feedstock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc_toolchain-feedstock b/gcc_toolchain-feedstock index 4c0a4d997..525581cbf 160000 --- a/gcc_toolchain-feedstock +++ b/gcc_toolchain-feedstock @@ -1 +1 @@ -Subproject commit 4c0a4d997795b643346dd071598ce13578be7b1e +Subproject commit 525581cbf9edd348209e0bf8c56be267e86ee969 From c7ea0dc90f509547dee4b2ccbdd4948b87785455 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 8 Jun 2022 17:28:38 +0200 Subject: [PATCH 4/5] protobuf: update pin --- protobuf-feedstock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protobuf-feedstock b/protobuf-feedstock index 72609b60a..6bca01bfe 160000 --- a/protobuf-feedstock +++ b/protobuf-feedstock @@ -1 +1 @@ -Subproject commit 72609b60a31d365b8dbea25b5065e4e5d846114b +Subproject commit 6bca01bfe4559cba1ca7b9ff5973110aed6d609c From b7bd0be5035a48c62be3841f771f0e71eac36ed7 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 8 Jun 2022 17:36:15 +0200 Subject: [PATCH 5/5] protobuf-3.11.2: add version pin --- .gitmodules | 4 ++++ protobuf-3.11.2-feedstock | 1 + 2 files changed, 5 insertions(+) create mode 160000 protobuf-3.11.2-feedstock diff --git a/.gitmodules b/.gitmodules index 644af52d2..0e6055dea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/protobuf-3.11.2-feedstock b/protobuf-3.11.2-feedstock new file mode 160000 index 000000000..349bb99da --- /dev/null +++ b/protobuf-3.11.2-feedstock @@ -0,0 +1 @@ +Subproject commit 349bb99dae0b8faaf30d178bffbb34801bc66244