Skip to content

Commit 45ada94

Browse files
SC426SC426
authored
Merge pull request #7 from AnacondaRecipes/v1.76
Version 1.76
2 parents 0f5c58b + 1481b8e commit 45ada94

File tree

3 files changed

+80
-64
lines changed

3 files changed

+80
-64
lines changed

‎recipe/conda_build_config.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ rust_arch:
22
- x86_64-unknown-linux-gnu # [linux64]
33
- s390x-unknown-linux-gnu # [s390x]
44
- aarch64-unknown-linux-gnu # [aarch64]
5-
- powerpc64le-unknown-linux-gnu # [ppc64le]
65
- x86_64-apple-darwin # [osx and x86_64]
76
- aarch64-apple-darwin # [osx and arm64]
7+
macos_min_version:
8+
- 10.12 # [osx and x86_64]
9+
MACOSX_DEPLOYMENT_TARGET:
10+
- 10.12 # [osx and x86_64]
11+
CONDA_BUILD_SYSROOT:
12+
- /opt/MacOSX10.12.sdk # [osx and x86_64]

‎recipe/forge_test.sh

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
#!/bin/bash -e -x
22

3-
## TODO: remove the following `unset` lines, once the following issue in `conda-build` is resolved:
4-
## <https://github.com/conda/conda-build/issues/2255>
5-
6-
unset REQUESTS_CA_BUNDLE
7-
unset SSL_CERT_FILE
8-
9-
rustc --help
10-
rustdoc --help
11-
cargo --help
12-
133
echo "#!/usr/bin/env bash" > ./cc
14-
if [[ ${target_platform} =~ linux.* ]]; then
15-
echo "x86_64-conda_cos6-linux-gnu-cc \"\$@\"" >> ./cc
4+
if [[ ${target_platform} =~ linux.*390x.* ]]; then
5+
echo "s390x-conda_cos7-linux-gnu-cc \"\$@\"" >> ./cc
6+
elif [[ ${target_platform} =~ linux.*aarch64* ]]; then
7+
echo "aarch64-conda-linux-gnu-cc \"\$@\"" >> ./cc
8+
elif [[ ${target_platform} =~ linux.* ]]; then
9+
echo "x86_64-conda_cos7-linux-gnu-cc \"\$@\"" >> ./cc
1610
elif [[ ${target_platform} == osx-64 ]]; then
1711
echo "x86_64-apple-darwin13.4.0-clang \"\$@\"" >> ./cc
18-
export CONDA_BUILD_SYSROOT=/opt/MacOSX10.10.sdk
12+
export CONDA_BUILD_SYSROOT=/opt/MacOSX10.12.sdk
13+
elif [[ ${target_platform} == osx-arm64 ]]; then
14+
echo "arm64-apple-darwin20.0.0-clang \"\$@\"" >> ./cc
1915
fi
2016
cat cc
2117
chmod +x cc

‎recipe/meta.yaml

Lines changed: 65 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,109 @@
1-
{% set version = "1.71.1" %}
1+
{% set version = "1.76.0" %}
22

33
package:
44
name: 'rust-suite'
55
version: {{ version }}
66

77
source:
88
- url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-unknown-linux-gnu.tar.gz # [linux64]
9-
sha256: 34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4 # [linux64]
9+
sha256: 9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399 # [linux64]
1010
- url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-unknown-linux-gnu.tar.gz # [aarch64]
11-
sha256: c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f # [aarch64]
12-
- url: https://static.rust-lang.org/dist/rust-{{ version }}-powerpc64le-unknown-linux-gnu.tar.gz # [ppc64le]
13-
sha256: bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537 # [ppc64le]
11+
sha256: 2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0 # [aarch64]
1412
- url: https://static.rust-lang.org/dist/rust-{{ version }}-s390x-unknown-linux-gnu.tar.gz # [s390x]
15-
sha256: 4205dc823ef57c4d9bdf80fb4ecb1e23a71af6dca05432b9fb5a6e9e08fe8f19 # [s390x]
13+
sha256: 885152d9df8a1db017a2eba315d9f6742b64d638416c1c8b7b5ed5f7cab4b7f4 # [s390x]
1614
- url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-apple-darwin.tar.gz # [osx and x86_64]
17-
sha256: 916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c # [osx and x86_64]
15+
sha256: 7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7 # [osx and x86_64]
1816
- url: https://static.rust-lang.org/dist/rust-{{ version }}-aarch64-apple-darwin.tar.gz # [osx and arm64]
19-
sha256: f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351 # [osx and arm64]
17+
sha256: 17496f15c3cb6ff73d5c36f5b54cc110f1ac31fa09521a7991c0d7ddd890dceb # [osx and arm64]
2018
- url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-pc-windows-msvc.tar.gz # [win64]
21-
sha256: 0234bf6ef1ef3efe1809ba548d0ac9c6eeb8a91fb25145caf5547d8614da0049 # [win64]
19+
sha256: cc908e1f0625aae0da5f4a35c390828947887929af694029fc3ccdf4cc66b0dd # [win64]
2220
folder: msvc # [win64]
2321
- url: https://static.rust-lang.org/dist/rust-{{ version }}-x86_64-pc-windows-gnu.tar.gz # [win64]
24-
sha256: 15289233721ad7c3d697890d9c6079ca3b8a0f6740c080fbec3e8ae3a5ea5c8c # [win64]
22+
sha256: 5a9722e73b4511d41cc70270a730f233da43c8c2e103ae469c3b62d89e78df35 # [win64]
2523
folder: gnu # [win64]
2624

2725
build:
2826
number: 0
29-
# the distributed binaries are already relocatable
30-
binary_relocation: False
31-
runpath_whitelist:
32-
- $ORIGIN/../lib
33-
missing_dso_whitelist:
34-
- /usr/lib/libresolv.9.dylib
35-
- /usr/lib/libc++.1.dylib
36-
- /usr/lib/libc++abi.dylib
37-
- /usr/lib/libiconv.2.dylib
38-
- /usr/lib/libcurl.4.dylib
39-
- /usr/lib/libxar.1.dylib
40-
- $RPATH/libLLVM-14-rust-1.64.0-stable.so
41-
# Since 1.32.0 macOS also needs:
42-
- /System/Library/Frameworks/Python.framework/Versions/2.7/Python
43-
- /System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols
44-
- /usr/lib/libcompression.dylib
45-
- /usr/lib/libedit.3.dylib
46-
- /usr/lib/libform.5.4.dylib
47-
- /usr/lib/libncurses.5.4.dylib
48-
- /usr/lib/libpanel.5.4.dylib
49-
- /usr/lib/libxml2.2.dylib
50-
# Fixed via install_name_tool now (just declaring it here meant the thing using -
51-
# lib/rustlib/x86_64-apple-darwin/lib/python2.7/site-packages/lldb/lldb-argdumper - was
52-
# still unable to find it at runtime).
53-
# - $RPATH/libLLVM.dylib
54-
55-
- '**/ld-linux-x86-64.so.2'
56-
- '**/libc.so.6'
57-
- '**/libdl.so.2'
58-
- '**/ld64.so.*'
59-
- '**/libgcc_s.so.1'
60-
- '**/libm.so.6'
61-
- '**/libpthread.so.0'
62-
- '**/librt.so.1'
63-
- '**/libgcc_s.so.1'
64-
- '**/libz.so.1'
65-
# Since 1.32.0 linux also needs:
66-
- '**/libstdc++.so.6'
6727

6828
outputs:
6929
- name: rust
7030
script: install-msvc.bat # [win]
7131
script: install-unix.sh # [not win]
32+
build:
33+
run_exports: # [osx and x86_64]
34+
strong_constrains: # [osx and x86_64]
35+
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.12") }} # [osx and x86_64]
36+
# the distributed binaries are already relocatable
37+
binary_relocation: False
38+
runpath_whitelist:
39+
- $ORIGIN/../lib
40+
missing_dso_whitelist:
41+
- /usr/lib/libresolv.9.dylib
42+
- /usr/lib/libc++.1.dylib
43+
- /usr/lib/libc++abi.dylib
44+
- /usr/lib/libiconv.2.dylib
45+
- /usr/lib/libcurl.4.dylib
46+
- /usr/lib/libxar.1.dylib
47+
- $RPATH/libLLVM-14-rust-1.64.0-stable.so
48+
# Since 1.32.0 macOS also needs:
49+
- /System/Library/Frameworks/Python.framework/Versions/2.7/Python
50+
- /System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols
51+
- /usr/lib/libcompression.dylib
52+
- /usr/lib/libedit.3.dylib
53+
- /usr/lib/libform.5.4.dylib
54+
- /usr/lib/libncurses.5.4.dylib
55+
- /usr/lib/libpanel.5.4.dylib
56+
- /usr/lib/libxml2.2.dylib
57+
# Fixed via install_name_tool now (just declaring it here meant the thing using -
58+
# lib/rustlib/x86_64-apple-darwin/lib/python2.7/site-packages/lldb/lldb-argdumper - was
59+
# still unable to find it at runtime).
60+
# - $RPATH/libLLVM.dylib
61+
62+
- '**/ld-linux-x86-64.so.2'
63+
- '**/libc.so.6'
64+
- '**/libdl.so.2'
65+
- '**/ld64.so.*'
66+
- '**/libgcc_s.so.1'
67+
- '**/libm.so.6'
68+
- '**/libpthread.so.0'
69+
- '**/librt.so.1'
70+
- '**/libgcc_s.so.1'
71+
- '**/libz.so.1'
72+
# Since 1.32.0 linux also needs:
73+
- '**/libstdc++.so.6'
7274
requirements:
7375
build:
7476
- {{ compiler('c') }} # [osx]
7577
- posix # [win]
7678
test:
79+
requires:
80+
- {{ compiler('c') }}
81+
- {{ compiler('cxx') }}
82+
files:
83+
- forge_test.sh # [not win]
7784
commands:
85+
- if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win]
7886
- rustc --version
7987
- cargo --help
80-
88+
- rustc --help
89+
- rustdoc --help
90+
- time bash ./forge_test.sh # [not win]
8191

8292
- name: rust-gnu # [win]
8393
script: install-gnu.bat # [win]
94+
build: # [win]
95+
# the distributed binaries are already relocatable
96+
binary_relocation: False # [win]
8497
requirements: # [win]
8598
build: # [win]
8699
- posix # [win]
87100
test: # [win]
88101
commands: # [win]
89102
- rustc --version # [win]
90103
- cargo --help # [win]
104+
- rustc --help # [win]
105+
- rustdoc --help # [win]
106+
- if exist %LIBRARY_PREFIX%\share\doc\rust\html\sysroot exit 1 # [win]
91107

92108
about:
93109
home: https://www.rust-lang.org
@@ -100,7 +116,6 @@ about:
100116
This package provides the compiler (rustc) and the documentation utilities rustdoc.
101117
dev_url: https://github.com/rust-lang/rust
102118
doc_url: https://www.rust-lang.org/learn
103-
doc_source_url: https://github.com/rust-lang/rust/tree/{{ version }}/src/doc
104119

105120
extra:
106121
# The license files cannot be found properly on Windows

0 commit comments

Comments
 (0)