From 2fa7f89e98a372a50601c33f8b2af397d6e1a6d9 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 15:07:19 -0700 Subject: [PATCH 01/28] update version --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ca5c2f7..0fe43b6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.71.1" %} +{% set version = "1.76.0" %} package: name: 'rust-suite' From 5f76ccc42ec5b1fe9f912e4a20f6dbd520c4f88c Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 15:07:39 -0700 Subject: [PATCH 02/28] update SOME sha256 --- recipe/meta.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0fe43b6..3edf1c6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,19 +6,17 @@ package: source: - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-unknown-linux-gnu.tar.gz # [linux64] - sha256: 34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4 # [linux64] + sha256: 9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399 # [linux64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-unknown-linux-gnu.tar.gz # [aarch64] - sha256: c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f # [aarch64] - - url: https://static.rust-lang.org/dist/rust-{{ version }}-powerpc64le-unknown-linux-gnu.tar.gz # [ppc64le] - sha256: bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537 # [ppc64le] + sha256: 171e118a34ad6bbf12540a3f1644649b0a9623c3381449ec4639f68bf293dc4e # [aarch64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-s390x-unknown-linux-gnu.tar.gz # [s390x] sha256: 4205dc823ef57c4d9bdf80fb4ecb1e23a71af6dca05432b9fb5a6e9e08fe8f19 # [s390x] - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-apple-darwin.tar.gz # [osx and x86_64] - sha256: 916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c # [osx and x86_64] + sha256: 7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7 # [osx and x86_64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-apple-darwin.tar.gz # [osx and arm64] - sha256: f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351 # [osx and arm64] + sha256: 17496f15c3cb6ff73d5c36f5b54cc110f1ac31fa09521a7991c0d7ddd890dceb # [osx and arm64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-pc-windows-msvc.tar.gz # [win64] - sha256: 0234bf6ef1ef3efe1809ba548d0ac9c6eeb8a91fb25145caf5547d8614da0049 # [win64] + sha256: cc908e1f0625aae0da5f4a35c390828947887929af694029fc3ccdf4cc66b0dd # [win64] folder: msvc # [win64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-pc-windows-gnu.tar.gz # [win64] sha256: 15289233721ad7c3d697890d9c6079ca3b8a0f6740c080fbec3e8ae3a5ea5c8c # [win64] From 6f10f90e015c355fd43dea78b91e945e87ca0caf Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 15:30:39 -0700 Subject: [PATCH 03/28] update last sha256 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3edf1c6..ca4671d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: sha256: cc908e1f0625aae0da5f4a35c390828947887929af694029fc3ccdf4cc66b0dd # [win64] folder: msvc # [win64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-pc-windows-gnu.tar.gz # [win64] - sha256: 15289233721ad7c3d697890d9c6079ca3b8a0f6740c080fbec3e8ae3a5ea5c8c # [win64] + sha256: 5a9722e73b4511d41cc70270a730f233da43c8c2e103ae469c3b62d89e78df35 # [win64] folder: gnu # [win64] build: From c6abc00706800cf9bdc6a2f15eb7adbf1bc67cff Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 15:58:55 -0700 Subject: [PATCH 04/28] update aarch64 sha256 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ca4671d..9b3e744 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,7 @@ source: - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-unknown-linux-gnu.tar.gz # [linux64] sha256: 9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399 # [linux64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-unknown-linux-gnu.tar.gz # [aarch64] - sha256: 171e118a34ad6bbf12540a3f1644649b0a9623c3381449ec4639f68bf293dc4e # [aarch64] + sha256: 2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0 # [aarch64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-s390x-unknown-linux-gnu.tar.gz # [s390x] sha256: 4205dc823ef57c4d9bdf80fb4ecb1e23a71af6dca05432b9fb5a6e9e08fe8f19 # [s390x] - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-apple-darwin.tar.gz # [osx and x86_64] From 9c22bae671f6353078866ea94311a1ce0f587732 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 16:29:30 -0700 Subject: [PATCH 05/28] update s390x sha256 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9b3e744..6a22bd4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: - url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-unknown-linux-gnu.tar.gz # [aarch64] sha256: 2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0 # [aarch64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-s390x-unknown-linux-gnu.tar.gz # [s390x] - sha256: 4205dc823ef57c4d9bdf80fb4ecb1e23a71af6dca05432b9fb5a6e9e08fe8f19 # [s390x] + sha256: 885152d9df8a1db017a2eba315d9f6742b64d638416c1c8b7b5ed5f7cab4b7f4 # [s390x] - url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-apple-darwin.tar.gz # [osx and x86_64] sha256: 7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7 # [osx and x86_64] - url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-apple-darwin.tar.gz # [osx and arm64] From bacfebbe2f0e2418e58ff293951f69e43d6c5d38 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 7 Mar 2024 16:29:40 -0700 Subject: [PATCH 06/28] linter fixes --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6a22bd4..3d8abb3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -98,7 +98,6 @@ about: This package provides the compiler (rustc) and the documentation utilities rustdoc. dev_url: https://github.com/rust-lang/rust doc_url: https://www.rust-lang.org/learn - doc_source_url: https://github.com/rust-lang/rust/tree/{{ version }}/src/doc extra: # The license files cannot be found properly on Windows From 1b51f99571534f4a1db904253adb617e80aa41b3 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 8 Mar 2024 11:54:43 -0700 Subject: [PATCH 07/28] include conda-forge tests --- recipe/meta.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d8abb3..73d342f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,7 +75,11 @@ outputs: commands: - rustc --version - cargo --help - + - cargo --config registries.crates-io.protocol=\"sparse\" install --force xsv + - rustc --help + - rustdoc --help + - echo {{ rust_arch }} + - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] - name: rust-gnu # [win] script: install-gnu.bat # [win] @@ -86,6 +90,11 @@ outputs: commands: # [win] - rustc --version # [win] - cargo --help # [win] + - cargo --config registries.crates-io.protocol=\"sparse\" install --force xsv # [win] + - rustc --help # [win] + - rustdoc --help # [win] + - echo {{ rust_arch }} # [win] + - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] about: home: https://www.rust-lang.org From 21e4b8e9fcfafeafd74944a780f8f1a79f36cc0a Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 8 Mar 2024 12:01:02 -0700 Subject: [PATCH 08/28] update tests --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 73d342f..b44db56 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,6 @@ outputs: - cargo --config registries.crates-io.protocol=\"sparse\" install --force xsv - rustc --help - rustdoc --help - - echo {{ rust_arch }} - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] - name: rust-gnu # [win] @@ -93,7 +92,6 @@ outputs: - cargo --config registries.crates-io.protocol=\"sparse\" install --force xsv # [win] - rustc --help # [win] - rustdoc --help # [win] - - echo {{ rust_arch }} # [win] - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] about: From 7b37911b481c06d7ae1eb3f6ed788ef36e49df19 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 11 Mar 2024 14:31:35 -0600 Subject: [PATCH 09/28] add forge_test.sh --- recipe/forge_test.sh | 10 ++++++++-- recipe/meta.yaml | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/recipe/forge_test.sh b/recipe/forge_test.sh index c702799..cf66282 100644 --- a/recipe/forge_test.sh +++ b/recipe/forge_test.sh @@ -11,11 +11,17 @@ rustdoc --help cargo --help echo "#!/usr/bin/env bash" > ./cc -if [[ ${target_platform} =~ linux.* ]]; then - echo "x86_64-conda_cos6-linux-gnu-cc \"\$@\"" >> ./cc +if [[ ${target_platform} =~ linux.*390x.* ]]; then + echo "s390x-conda_cos7-linux-gnu-cc \"\$@\"" >> ./cc +elif [[ ${target_platform} =~ linux.*aarch64* ]]; then + echo "aarch64-conda-linux-gnu-cc \"\$@\"" >> ./cc +elif [[ ${target_platform} =~ linux.* ]]; then + echo "x86_64-conda_cos7-linux-gnu-cc \"\$@\"" >> ./cc elif [[ ${target_platform} == osx-64 ]]; then echo "x86_64-apple-darwin13.4.0-clang \"\$@\"" >> ./cc export CONDA_BUILD_SYSROOT=/opt/MacOSX10.10.sdk +elif [[ ${target_platform} == osx-arm64 ]]; then + echo "arm64-apple-darwin20.0.0-clang \"\$@\"" >> ./cc fi cat cc chmod +x cc diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b44db56..b4e6a46 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -72,10 +72,11 @@ outputs: - {{ compiler('c') }} # [osx] - posix # [win] test: + files: + - forge_test.sh # [unix] commands: - rustc --version - cargo --help - - cargo --config registries.crates-io.protocol=\"sparse\" install --force xsv - rustc --help - rustdoc --help - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] @@ -86,10 +87,11 @@ outputs: build: # [win] - posix # [win] test: # [win] + files: + - forge_test.sh # [win] commands: # [win] - rustc --version # [win] - cargo --help # [win] - - cargo --config registries.crates-io.protocol=\"sparse\" install --force xsv # [win] - rustc --help # [win] - rustdoc --help # [win] - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] From c31264833de80f6256193e22ccc281a376882eb4 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 11 Mar 2024 14:55:17 -0600 Subject: [PATCH 10/28] add command to call forge_test --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b4e6a46..ab79c2c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -75,6 +75,7 @@ outputs: files: - forge_test.sh # [unix] commands: + - time bash ./forge_test.sh # [not win] - rustc --version - cargo --help - rustc --help @@ -90,6 +91,7 @@ outputs: files: - forge_test.sh # [win] commands: # [win] + - time bash ./forge_test.sh # [win] - rustc --version # [win] - cargo --help # [win] - rustc --help # [win] From 9fcf911135a3ef63d2fb6437850efe490cb9014a Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 11 Mar 2024 15:33:46 -0600 Subject: [PATCH 11/28] fix tests --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ab79c2c..56c577f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -72,15 +72,18 @@ outputs: - {{ compiler('c') }} # [osx] - posix # [win] test: + requires: + - {{ compiler('c') }} + - {{ compiler('cxx') }} files: - - forge_test.sh # [unix] + - forge_test.sh # [not win] commands: - - time bash ./forge_test.sh # [not win] - rustc --version - cargo --help - rustc --help - rustdoc --help - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] + - time bash ./forge_test.sh # [not win] - name: rust-gnu # [win] script: install-gnu.bat # [win] @@ -88,10 +91,7 @@ outputs: build: # [win] - posix # [win] test: # [win] - files: - - forge_test.sh # [win] commands: # [win] - - time bash ./forge_test.sh # [win] - rustc --version # [win] - cargo --help # [win] - rustc --help # [win] From 0366d12c2f5919342532af05b433246e58e57fd1 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 12:43:44 -0600 Subject: [PATCH 12/28] remove ppc64le --- recipe/conda_build_config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 9d29d3d..500e33a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,6 +2,5 @@ rust_arch: - x86_64-unknown-linux-gnu # [linux64] - s390x-unknown-linux-gnu # [s390x] - aarch64-unknown-linux-gnu # [aarch64] - - powerpc64le-unknown-linux-gnu # [ppc64le] - x86_64-apple-darwin # [osx and x86_64] - aarch64-apple-darwin # [osx and arm64] From e86e0eda77fc0c9ec2ec6ef09f5d0abd18d64f66 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 12:44:25 -0600 Subject: [PATCH 13/28] move relevant commands to forge_test --- recipe/forge_test.sh | 1 + recipe/meta.yaml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/forge_test.sh b/recipe/forge_test.sh index cf66282..a9ecf41 100644 --- a/recipe/forge_test.sh +++ b/recipe/forge_test.sh @@ -6,6 +6,7 @@ unset REQUESTS_CA_BUNDLE unset SSL_CERT_FILE +rustc --version rustc --help rustdoc --help cargo --help diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 56c577f..d9f2d32 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,10 +78,6 @@ outputs: files: - forge_test.sh # [not win] commands: - - rustc --version - - cargo --help - - rustc --help - - rustdoc --help - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] - time bash ./forge_test.sh # [not win] From ba955a1654430dacdd504c6ce8e01f068c862577 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 13:16:00 -0600 Subject: [PATCH 14/28] test --- recipe/forge_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/forge_test.sh b/recipe/forge_test.sh index a9ecf41..3131bcb 100644 --- a/recipe/forge_test.sh +++ b/recipe/forge_test.sh @@ -3,8 +3,8 @@ ## TODO: remove the following `unset` lines, once the following issue in `conda-build` is resolved: ## -unset REQUESTS_CA_BUNDLE -unset SSL_CERT_FILE +# unset REQUESTS_CA_BUNDLE +# unset SSL_CERT_FILE rustc --version rustc --help From 20a8e546b39311040c1ae9af9197e300a2275a0b Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 13:42:47 -0600 Subject: [PATCH 15/28] change deployment target fversion for osx-64 --- .ci_support/osx_.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml index c15bf72..672a4d0 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_.yaml @@ -1,5 +1,6 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +- '10.12' # [osx and x86_64] build_number_decrement: - '0' channel_sources: @@ -12,3 +13,4 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.9' +- '10.12' # [osx and x86_64] From b48ba422414dcdf663da1d499f18d91703f041a0 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 13:43:00 -0600 Subject: [PATCH 16/28] clean up tests --- recipe/forge_test.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/forge_test.sh b/recipe/forge_test.sh index 3131bcb..b9fb0a2 100644 --- a/recipe/forge_test.sh +++ b/recipe/forge_test.sh @@ -1,11 +1,5 @@ #!/bin/bash -e -x -## TODO: remove the following `unset` lines, once the following issue in `conda-build` is resolved: -## - -# unset REQUESTS_CA_BUNDLE -# unset SSL_CERT_FILE - rustc --version rustc --help rustdoc --help From dfe647e0f167e8d42693a1da565108441a0f7b72 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 14:09:54 -0600 Subject: [PATCH 17/28] move to conda_build_config --- .ci_support/osx_.yaml | 2 -- recipe/conda_build_config.yaml | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml index 672a4d0..c15bf72 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_.yaml @@ -1,6 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -- '10.12' # [osx and x86_64] build_number_decrement: - '0' channel_sources: @@ -13,4 +12,3 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.9' -- '10.12' # [osx and x86_64] diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 500e33a..7823a08 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,3 +4,7 @@ rust_arch: - aarch64-unknown-linux-gnu # [aarch64] - x86_64-apple-darwin # [osx and x86_64] - aarch64-apple-darwin # [osx and arm64] +macos_min_version: + - 10.12 # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: + - 10.12 # [osx and x86_64] \ No newline at end of file From 6fde3c56bce49e51aeefa1a6aa9aeb85e69d9576 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 14:42:34 -0600 Subject: [PATCH 18/28] try moving to meta.yaml --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d9f2d32..c71cd08 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,12 +67,16 @@ outputs: - name: rust script: install-msvc.bat # [win] script: install-unix.sh # [not win] + run_exports: + strong_constrains: + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] requirements: build: - {{ compiler('c') }} # [osx] - posix # [win] test: requires: + - __osx >=10.12 # [osx and x86_64] - {{ compiler('c') }} - {{ compiler('cxx') }} files: From cd38c5f227de06d670a43e34c6ce3d7422ea8d51 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 14:42:52 -0600 Subject: [PATCH 19/28] remove from conda_build_config --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 7823a08..500e33a 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,7 +4,3 @@ rust_arch: - aarch64-unknown-linux-gnu # [aarch64] - x86_64-apple-darwin # [osx and x86_64] - aarch64-apple-darwin # [osx and arm64] -macos_min_version: - - 10.12 # [osx and x86_64] -MACOSX_DEPLOYMENT_TARGET: - - 10.12 # [osx and x86_64] \ No newline at end of file From 4b836ff50e7d0dbe34e0504f0e7d6b6b25afbe43 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 15:37:49 -0600 Subject: [PATCH 20/28] test --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c71cd08..0cb1a39 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,7 +76,6 @@ outputs: - posix # [win] test: requires: - - __osx >=10.12 # [osx and x86_64] - {{ compiler('c') }} - {{ compiler('cxx') }} files: From 104eecc5d4d4ff8a7768c0c46e80d9eb33b29a2d Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 12 Mar 2024 15:46:26 -0600 Subject: [PATCH 21/28] test --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0cb1a39..0c4aff1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,15 +67,13 @@ outputs: - name: rust script: install-msvc.bat # [win] script: install-unix.sh # [not win] - run_exports: - strong_constrains: - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] requirements: build: - {{ compiler('c') }} # [osx] - posix # [win] test: requires: + - __osx >=10.12 # [osx and x86_64] - {{ compiler('c') }} - {{ compiler('cxx') }} files: From 8968ff4543c51e6310692aa4a692026f213cb6b1 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 09:31:03 -0600 Subject: [PATCH 22/28] revert --- recipe/conda_build_config.yaml | 4 ++++ recipe/meta.yaml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 500e33a..7823a08 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,3 +4,7 @@ rust_arch: - aarch64-unknown-linux-gnu # [aarch64] - x86_64-apple-darwin # [osx and x86_64] - aarch64-apple-darwin # [osx and arm64] +macos_min_version: + - 10.12 # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: + - 10.12 # [osx and x86_64] \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0c4aff1..c71cd08 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,6 +67,9 @@ outputs: - name: rust script: install-msvc.bat # [win] script: install-unix.sh # [not win] + run_exports: + strong_constrains: + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] requirements: build: - {{ compiler('c') }} # [osx] From aadc30d69bd216405c341988a3c56114fa3bb824 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 10:30:03 -0600 Subject: [PATCH 23/28] fix run_exports --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c71cd08..8635987 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -68,8 +68,7 @@ outputs: script: install-msvc.bat # [win] script: install-unix.sh # [not win] run_exports: - strong_constrains: - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] requirements: build: - {{ compiler('c') }} # [osx] From 6e130dec68ba45b50d7b0754c5b9d53582b9e8ec Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 10:59:22 -0600 Subject: [PATCH 24/28] reconfigure recipe --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8635987..ca4081b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,10 +67,9 @@ outputs: - name: rust script: install-msvc.bat # [win] script: install-unix.sh # [not win] - run_exports: - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] requirements: build: + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] - {{ compiler('c') }} # [osx] - posix # [win] test: From 896ba46313fbaa4981be72a004dba33f465c647d Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Wed, 13 Mar 2024 14:41:52 -0400 Subject: [PATCH 25/28] min osx 10.12 --- recipe/conda_build_config.yaml | 4 +++- recipe/forge_test.sh | 7 +------ recipe/meta.yaml | 10 ++++++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 7823a08..043dac4 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -7,4 +7,6 @@ rust_arch: macos_min_version: - 10.12 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: - - 10.12 # [osx and x86_64] \ No newline at end of file + - 10.12 # [osx and x86_64] +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.12.sdk # [osx and x86_64] \ No newline at end of file diff --git a/recipe/forge_test.sh b/recipe/forge_test.sh index b9fb0a2..7b09578 100644 --- a/recipe/forge_test.sh +++ b/recipe/forge_test.sh @@ -1,10 +1,5 @@ #!/bin/bash -e -x -rustc --version -rustc --help -rustdoc --help -cargo --help - echo "#!/usr/bin/env bash" > ./cc if [[ ${target_platform} =~ linux.*390x.* ]]; then echo "s390x-conda_cos7-linux-gnu-cc \"\$@\"" >> ./cc @@ -14,7 +9,7 @@ elif [[ ${target_platform} =~ linux.* ]]; then echo "x86_64-conda_cos7-linux-gnu-cc \"\$@\"" >> ./cc elif [[ ${target_platform} == osx-64 ]]; then echo "x86_64-apple-darwin13.4.0-clang \"\$@\"" >> ./cc - export CONDA_BUILD_SYSROOT=/opt/MacOSX10.10.sdk + export CONDA_BUILD_SYSROOT=/opt/MacOSX10.12.sdk elif [[ ${target_platform} == osx-arm64 ]]; then echo "arm64-apple-darwin20.0.0-clang \"\$@\"" >> ./cc fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ca4081b..7cf5371 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,20 +67,26 @@ outputs: - name: rust script: install-msvc.bat # [win] script: install-unix.sh # [not win] + build: + run_exports: + strong: + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] requirements: build: - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] - {{ compiler('c') }} # [osx] - posix # [win] test: requires: - - __osx >=10.12 # [osx and x86_64] - {{ compiler('c') }} - {{ compiler('cxx') }} files: - forge_test.sh # [not win] commands: - if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win] + - rustc --version + - cargo --help + - rustc --help + - rustdoc --help - time bash ./forge_test.sh # [not win] - name: rust-gnu # [win] From 153ca1846072b74b1b4bd98f0445e54ec6128a2c Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Wed, 13 Mar 2024 14:55:47 -0400 Subject: [PATCH 26/28] relocate missing_dso_whitelist to outputs --- recipe/meta.yaml | 79 +++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7cf5371..92c0461 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,44 +24,6 @@ source: build: number: 0 - # the distributed binaries are already relocatable - binary_relocation: False - runpath_whitelist: - - $ORIGIN/../lib - missing_dso_whitelist: - - /usr/lib/libresolv.9.dylib - - /usr/lib/libc++.1.dylib - - /usr/lib/libc++abi.dylib - - /usr/lib/libiconv.2.dylib - - /usr/lib/libcurl.4.dylib - - /usr/lib/libxar.1.dylib - - $RPATH/libLLVM-14-rust-1.64.0-stable.so - # Since 1.32.0 macOS also needs: - - /System/Library/Frameworks/Python.framework/Versions/2.7/Python - - /System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols - - /usr/lib/libcompression.dylib - - /usr/lib/libedit.3.dylib - - /usr/lib/libform.5.4.dylib - - /usr/lib/libncurses.5.4.dylib - - /usr/lib/libpanel.5.4.dylib - - /usr/lib/libxml2.2.dylib - # Fixed via install_name_tool now (just declaring it here meant the thing using - - # lib/rustlib/x86_64-apple-darwin/lib/python2.7/site-packages/lldb/lldb-argdumper - was - # still unable to find it at runtime). - # - $RPATH/libLLVM.dylib - - - '**/ld-linux-x86-64.so.2' - - '**/libc.so.6' - - '**/libdl.so.2' - - '**/ld64.so.*' - - '**/libgcc_s.so.1' - - '**/libm.so.6' - - '**/libpthread.so.0' - - '**/librt.so.1' - - '**/libgcc_s.so.1' - - '**/libz.so.1' - # Since 1.32.0 linux also needs: - - '**/libstdc++.so.6' outputs: - name: rust @@ -71,6 +33,44 @@ outputs: run_exports: strong: - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] + # the distributed binaries are already relocatable + binary_relocation: False + runpath_whitelist: + - $ORIGIN/../lib + missing_dso_whitelist: + - /usr/lib/libresolv.9.dylib + - /usr/lib/libc++.1.dylib + - /usr/lib/libc++abi.dylib + - /usr/lib/libiconv.2.dylib + - /usr/lib/libcurl.4.dylib + - /usr/lib/libxar.1.dylib + - $RPATH/libLLVM-14-rust-1.64.0-stable.so + # Since 1.32.0 macOS also needs: + - /System/Library/Frameworks/Python.framework/Versions/2.7/Python + - /System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols + - /usr/lib/libcompression.dylib + - /usr/lib/libedit.3.dylib + - /usr/lib/libform.5.4.dylib + - /usr/lib/libncurses.5.4.dylib + - /usr/lib/libpanel.5.4.dylib + - /usr/lib/libxml2.2.dylib + # Fixed via install_name_tool now (just declaring it here meant the thing using - + # lib/rustlib/x86_64-apple-darwin/lib/python2.7/site-packages/lldb/lldb-argdumper - was + # still unable to find it at runtime). + # - $RPATH/libLLVM.dylib + + - '**/ld-linux-x86-64.so.2' + - '**/libc.so.6' + - '**/libdl.so.2' + - '**/ld64.so.*' + - '**/libgcc_s.so.1' + - '**/libm.so.6' + - '**/libpthread.so.0' + - '**/librt.so.1' + - '**/libgcc_s.so.1' + - '**/libz.so.1' + # Since 1.32.0 linux also needs: + - '**/libstdc++.so.6' requirements: build: - {{ compiler('c') }} # [osx] @@ -91,6 +91,9 @@ outputs: - name: rust-gnu # [win] script: install-gnu.bat # [win] + build: # [win] + # the distributed binaries are already relocatable + binary_relocation: False # [win] requirements: # [win] build: # [win] - posix # [win] From 9ff72af0c8b71b3152fd11b3d6fa5dc38d64451d Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Wed, 13 Mar 2024 16:34:29 -0400 Subject: [PATCH 27/28] no empty run_exports --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92c0461..a8fa84b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,8 +30,8 @@ outputs: script: install-msvc.bat # [win] script: install-unix.sh # [not win] build: - run_exports: - strong: + run_exports: # [osx and x86_64] + strong: # [osx and x86_64] - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] # the distributed binaries are already relocatable binary_relocation: False From 1481b8e665b9ef535bd9f4ba5f91c5d910eb0d1b Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 13 Mar 2024 14:44:15 -0600 Subject: [PATCH 28/28] change to strong_constrains --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a8fa84b..49771db 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,7 @@ outputs: script: install-unix.sh # [not win] build: run_exports: # [osx and x86_64] - strong: # [osx and x86_64] + strong_constrains: # [osx and x86_64] - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64] # the distributed binaries are already relocatable binary_relocation: False