|
Line
Link Here
|
| 0 |
-- a/dev-lang/rust/rust-1.44.1.ebuild |
0 |
++ b/dev-lang/rust/rust-1.44.1.ebuild |
|
Lines 58-71
Link Here
|
| 58 |
" |
58 |
" |
| 59 |
LLVM_MAX_SLOT=10 |
59 |
LLVM_MAX_SLOT=10 |
| 60 |
|
60 |
|
| 61 |
BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )" |
61 |
BDEPEND=" |
|
|
62 |
>=app-eselect/eselect-rust-20190311 |
| 63 |
system-bootstrap? ( |
| 64 |
|| ( |
| 65 |
>=dev-lang/rust-1.$(($(ver_cut 2) - 1)) |
| 66 |
>=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) |
| 67 |
) |
| 68 |
) |
| 69 |
!system-llvm? ( |
| 70 |
dev-util/cmake |
| 71 |
dev-util/ninja |
| 72 |
) |
| 73 |
" |
| 62 |
|
74 |
|
| 63 |
# libgit2 should be at least same as bundled into libgit-sys #707746 |
75 |
# libgit2 should be at least same as bundled into libgit-sys #707746 |
| 64 |
COMMON_DEPEND=" |
76 |
COMMON_DEPEND=" |
| 65 |
>=dev-libs/libgit2-0.99:= |
77 |
>=dev-libs/libgit2-0.99:= |
| 66 |
net-libs/libssh2:= |
78 |
net-libs/libssh2:= |
| 67 |
net-libs/http-parser:= |
79 |
net-libs/http-parser:= |
| 68 |
net-misc/curl:=[ssl] |
80 |
net-misc/curl:=[http2,ssl] |
| 69 |
sys-libs/zlib:= |
81 |
sys-libs/zlib:= |
| 70 |
!libressl? ( dev-libs/openssl:0= ) |
82 |
!libressl? ( dev-libs/openssl:0= ) |
| 71 |
libressl? ( dev-libs/libressl:0= ) |
83 |
libressl? ( dev-libs/libressl:0= ) |
|
Lines 81-91
DEPEND="${COMMON_DEPEND}
Link Here
|
| 81 |
>=sys-devel/gcc-4.7 |
93 |
>=sys-devel/gcc-4.7 |
| 82 |
>=sys-devel/clang-3.5 |
94 |
>=sys-devel/clang-3.5 |
| 83 |
) |
95 |
) |
| 84 |
system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) |
|
|
| 85 |
!system-llvm? ( |
| 86 |
dev-util/cmake |
| 87 |
dev-util/ninja |
| 88 |
) |
| 89 |
" |
96 |
" |
| 90 |
|
97 |
|
| 91 |
RDEPEND="${COMMON_DEPEND} |
98 |
RDEPEND="${COMMON_DEPEND} |
|
Lines 222-228
src_configure() {
Link Here
|
| 222 |
experimental-targets = "" |
229 |
experimental-targets = "" |
| 223 |
link-shared = $(toml_usex system-llvm) |
230 |
link-shared = $(toml_usex system-llvm) |
| 224 |
[build] |
231 |
[build] |
| 225 |
build = "${rust_target}" |
232 |
build = "$(rust_abi "${CBUILD}")" |
| 226 |
host = ["${rust_target}"] |
233 |
host = ["${rust_target}"] |
| 227 |
target = [${rust_targets}] |
234 |
target = [${rust_targets}] |
| 228 |
cargo = "${rust_stage0_root}/bin/cargo" |
235 |
cargo = "${rust_stage0_root}/bin/cargo" |
|
Lines 266-271
src_configure() {
Link Here
|
| 266 |
src-tarball = false |
273 |
src-tarball = false |
| 267 |
EOF |
274 |
EOF |
| 268 |
|
275 |
|
|
|
276 |
echo "CFLAGS_$(rust_abi "${CBUILD}")=-O2" >> "${S}"/config.env |
| 269 |
for v in $(multilib_get_enabled_abi_pairs); do |
277 |
for v in $(multilib_get_enabled_abi_pairs); do |
| 270 |
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) |
278 |
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) |
| 271 |
arch_cflags="$(get_abi_CFLAGS ${v##*.})" |
279 |
arch_cflags="$(get_abi_CFLAGS ${v##*.})" |
|
Lines 276-285
src_configure() {
Link Here
|
| 276 |
|
284 |
|
| 277 |
cat <<- EOF >> "${S}"/config.toml |
285 |
cat <<- EOF >> "${S}"/config.toml |
| 278 |
[target.${rust_target}] |
286 |
[target.${rust_target}] |
| 279 |
cc = "$(tc-getBUILD_CC)" |
287 |
cc = "$(tc-getCC)" |
| 280 |
cxx = "$(tc-getBUILD_CXX)" |
288 |
cxx = "$(tc-getCXX)" |
| 281 |
linker = "$(tc-getCC)" |
289 |
linker = "$(tc-getCC)" |
| 282 |
ar = "$(tc-getAR)" |
290 |
ar = "$(tc-getAR)" |
|
|
291 |
ranlib = "$(tc-getRANLIB)" |
| 283 |
EOF |
292 |
EOF |
| 284 |
# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; |
293 |
# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; |
| 285 |
if use elibc_musl; then |
294 |
if use elibc_musl; then |
|
Lines 346-351
src_configure() {
Link Here
|
| 346 |
cxx = "${cross_toolchain}-g++" |
355 |
cxx = "${cross_toolchain}-g++" |
| 347 |
linker = "${cross_toolchain}-gcc" |
356 |
linker = "${cross_toolchain}-gcc" |
| 348 |
ar = "${cross_toolchain}-ar" |
357 |
ar = "${cross_toolchain}-ar" |
|
|
358 |
ranlib = "${cross_toolchain}-ranlib" |
| 349 |
EOF |
359 |
EOF |
| 350 |
if use system-llvm; then |
360 |
if use system-llvm; then |
| 351 |
cat <<- EOF >> "${S}"/config.toml |
361 |
cat <<- EOF >> "${S}"/config.toml |
