Update Cargo, build curl/OpenSSL statically via features #54919

alexcrichton · 2018-10-08T19:59:28Z

In addition to to updating Cargo's submodule and Cargo's dependencies,
this also updates Cargo's build to build OpenSSL statically into Cargo
as well as libcurl unconditionally. This removes OpenSSL build logic
from the bootstrap code, and otherwise requests that even on OSX we
build curl statically.

rust-highfive · 2018-10-08T19:59:31Z

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2018-10-08T19:59:32Z

⚠️ Warning ⚠️

These commits modify submodules.

alexcrichton · 2018-10-08T19:59:40Z

r? @Mark-Simulacrum

Mark-Simulacrum

Looks generally good to me -- left a few nits.

Mark-Simulacrum · 2018-10-08T20:11:57Z

src/bootstrap/dist.rs

-                    });
-                    cmd.env("OPENSSL_DIR", dir);
-                }
+                // if let Some(dir) = builder.openssl_install_dir(builder.config.build) {


Hm, I think we probably want to keep this? Or I guess maybe just delete it since we're not managing openssl on our self?

Oops I meant to delete this! I built OpenSSL in at least one of our containers so I'm hoping that this isn't necessary any more, but if it fails on the bots I'll probably need to find a workaround

alexcrichton · 2018-10-08T21:57:31Z

@bors: r=Mark-Simulacrum

alexcrichton · 2018-10-18T13:32:01Z

Thanks @nrc! It looks like racer may also need an update to avoid duplicating rustc-ap-syntax, do you know if that's in the works?

nrc · 2018-10-18T19:18:10Z

I can do that this morning

nrc · 2018-10-18T20:08:44Z

hmm, updating Racer was harder than I thought - currently blocked on racer-rust/racer#974

bors · 2018-10-19T03:10:35Z

☔ The latest upstream changes (presumably #55004) made this pull request unmergeable. Please resolve the merge conflicts.

Xanewok · 2018-10-20T20:46:07Z

@nrc @alexcrichton with rust-lang/rls#1095 merged, the rustc-ap-* are deduplicated in the RLS (currently 274.0.0 is used)

In addition to to updating Cargo's submodule and Cargo's dependencies, this also updates Cargo's build to build OpenSSL statically into Cargo as well as libcurl unconditionally. This removes OpenSSL build logic from the bootstrap code, and otherwise requests that even on OSX we build curl statically.

alexcrichton · 2018-10-21T01:47:25Z

@Xanewok thanks so much for the update!

@bors: r=Mark-Simulacrum

bors · 2018-10-21T01:47:26Z

📌 Commit 4f661c0 has been approved by Mark-Simulacrum

bors · 2018-10-21T01:58:33Z

⌛ Testing commit 4f661c0 with merge cbc9745d20e7c60023bdb9ba926d65e99ea6b08d...

bors · 2018-10-21T04:59:43Z

💔 Test failed - status-travis

rust-highfive · 2018-10-21T04:59:45Z

The job dist-i686-linux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:04:35] + hide_output make install
[00:04:35] + set +x
[00:04:55] shared.sh: line 11:   351 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:04:55] + cd ..
[00:04:55] + rm -rf openssl-1.0.2k
[00:04:55] ./build-openssl.sh: line 25:  4114 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"  (wd: /tmp/openssl-1.0.2k)
[00:04:55] + ln -nsf /etc/pki/tls/cert.pem /rustroot/ssl/
[00:04:55] Removing intermediate container cb1b0327cbe6
[00:04:55] Step 14/41 : COPY dist-x86_64-linux/build-curl.sh /tmp/
[00:04:55]  ---> 8ff3d56defad
[00:04:55] Step 15/41 : RUN ./build-curl.sh
[00:04:55] Step 15/41 : RUN ./build-curl.sh
[00:04:55]  ---> Running in 93b60b77f33f
[00:04:56] + source shared.sh
[00:04:56] + VERSION=7.51.0
[00:04:56] + tar xjf -
[00:04:56] + curl http://cool.haxx.se/download/curl-7.51.0.tar.bz2
[00:04:57]                                  Dload  Upload   Total   Spent    Left  Speed
[00:04:59] 
  0 2509k    0  2631    0     0   1595      0  0:26:51  0:00:01  0:26:50  1595
 41 2509k   41 1035k    0     0   423k      0  0:00:05  0:00:02  0:00:03 1294k
 41 2509k   41 1035k    0     0   423k      0  0:00:05  0:00:02  0:00:03 1294k
100 2509k  100 2509k    0     0   859k      0  0:00:02  0:00:02 --:--:-- 1972k
[00:04:59] + mkdir curl-build
[00:04:59] + cd curl-build
[00:04:59] + hide_output ../curl-7.51.0/configure --prefix=/rustroot --with-ssl=/rustroot --disable-sspi --disable-gopher --disable-smtp --disable-smb --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-manual --disable-dict --disable-rtsp --disable-ldaps --disable-ldap
[00:05:21] + hide_output make -j10
[00:05:21] + set +x
[00:05:33] shared.sh: line 11:    11 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:05:33] + hide_output make install
---
 92 82.1M   92 75.6M    0     0  3451k      0  0:00:24  0:00:22  0:00:02 3259k
 96 82.1M   96 79.0M    0     0  3455k      0  0:00:24  0:00:23  0:00:01 3295k
100 82.1M  100 82.1M    0     0  3456k      0  0:00:24  0:00:24 --:--:-- 3400k
[00:09:25] + cd gcc-4.8.5
[00:09:25] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:09:25] --2018-10-21 02:12:20--  http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:09:25] Resolving gcc.gnu.org... 209.132.180.131
[00:09:25] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:09:25] HTTP request sent, awaiting response... 200 OK
---
 14 24.1M   14 3645k    0     0  4296k      0  0:00:05 --:--:--  0:00:05 4435k
 52 24.1M   52 12.5M    0     0  6955k      0  0:00:03  0:00:01  0:00:02 7058k
 82 24.1M   82 19.9M    0     0  7170k      0  0:00:03  0:00:02  0:00:01 7239k
100 24.1M  100 24.1M    0     0  7438k      0  0:00:03  0:00:03 --:--:-- 7501k
[00:43:51] + cd llvm-6.0.0.src
[00:43:51] + mkdir -p tools/clang
[00:43:51] + curl https://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz
[00:43:51] + tar xf - -C tools/clang --strip-components=1
[00:43:51] + xz -d
[00:43:51]                                  Dload  Upload   Total   Spent    Left  Speed
[00:43:53] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  3 11.4M    3  447k    0     0   873k      0  0:00:13 --:--:--  0:00:13  875k
  3 11.4M    3  447k    0     0   873k      0  0:00:13 --:--:--  0:00:13  875k
 67 11.4M   67 7901k    0     0  5222k      0  0:00:02  0:00:01  0:00:01 5229k
100 11.4M  100 11.4M    0     0  6130k      0  0:00:01  0:00:01 --:--:-- 6137k
[00:43:53] + mkdir -p tools/lld
[00:43:53] + curl https://releases.llvm.org/6.0.0/lld-6.0.0.src.tar.xz
[00:43:53] + xz -d
[00:43:53] + tar xf - -C tools/lld --strip-components=1
[00:43:53]                                  Dload  Upload   Total   Spent    Left  Speed
[00:43:53] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  772k  100  772k    0     0  1721k      0 --:--:-- --:--:-- --:--:-- 1730k
100  772k  100  772k    0     0  1721k      0 --:--:-- --:--:-- --:--:-- 1730k
[00:43:53] + mkdir ../clang-build
[00:43:53] + cd ../clang-build
[00:43:53] + INC=/rustroot/include
[00:43:53] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed
[00:43:53] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:43:53] + hide_output cmake ../llvm-6.0.0.src -DCMAKE_C_COMPILER=/rustroot/bin/gcc -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/rustroot -DLLVM_TARGETS_TO_BUILD=X86 -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:44:23] Sun Oct 21 02:47:18 UTC 2018 - building ...
[00:44:23] + hide_output make -j10
[00:44:23] + set +x
[00:44:53] Sun Oct 21 02:47:48 UTC 2018 - building ...
---
[01:39:34] + set +x
[01:39:36] + hide_output make INSTALL_HDR_PATH=dest headers_install
[01:39:36] + set +x
[01:39:39] shared.sh: line 11:    10 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[01:39:39] + find dest/include '(' -name .install -o -name ..install.cmd ')' -delete
[01:39:39] + yes
[01:39:39] + yes
[01:39:39] + cp -fr dest/include/asm dest/include/asm-generic dest/include/drm dest/include/linux dest/include/mtd dest/include/rdma dest/include/scsi dest/include/sound dest/include/video dest/include/xen /usr/include
[01:39:39] + rm -rf linux-3.2.84
[01:39:40]  ---> 928c5725efa8
[01:39:40] Removing intermediate container f66834543219
[01:39:40] Step 31/41 : COPY dist-x86_64-linux/build-perl.sh /tmp/
[01:39:40] Step 31/41 : COPY dist-x86_64-linux/build-perl.sh /tmp/
[01:39:40]  ---> 678214626f2d
[01:39:40] Step 32/41 : RUN ./build-perl.sh
[01:39:40]  ---> Running in 3f9fc14e92cd
[01:39:40] + source shared.sh
[01:39:40] + curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz
[01:39:40]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[01:39:40]                                  Dload  Upload   Total   Spent    Left  Speed
[01:39:42] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
[01:41:28] + hide_output make install
[01:41:28] + set +x
[01:41:39] shared.sh: line 11:  7771 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[01:41:39] + cd ..
[01:41:39] + rm -rf perl-5.28.0
[01:41:40] ./build-perl.sh: line 29: 13601 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"  (wd: /tmp/perl-5.28.0)
[01:41:41] Removing intermediate container 3f9fc14e92cd
[01:41:41] Step 33/41 : COPY scripts/sccache.sh /scripts/
[01:41:41]  ---> a423cb477005
[01:41:41] Step 34/41 : RUN sh /scripts/sccache.sh
---
[02:56:37]    Compiling rustc-workspace-hack v1.0.0 (/checkout/src/tools/rustc-workspace-hack)
[02:56:37] [RUSTC-TIMING] rustc_workspace_hack test:false 0.132
[02:56:37]    Compiling rustfix v0.4.2

Broadcast message from root@travis-job-fa3a456f-4a15-48ab-80c3-46f1af9506e5
 (unknown) at 4:59 ...
The system is going down for power off NOW!
[02:56:39] 
[02:56:40] Session terminated, killing shell...[RUSTC-TIMING] curl test:false 7.877

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

kennytm · 2018-10-21T05:12:02Z

@bors retry

"The system is going down for power off NOW!" again?!

bors · 2018-10-21T06:48:17Z

⌛ Testing commit 4f661c0 with merge 554b787...

Update Cargo, build curl/OpenSSL statically via features In addition to to updating Cargo's submodule and Cargo's dependencies, this also updates Cargo's build to build OpenSSL statically into Cargo as well as libcurl unconditionally. This removes OpenSSL build logic from the bootstrap code, and otherwise requests that even on OSX we build curl statically.

bors · 2018-10-21T09:32:21Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 554b787 to master...

rust-highfive assigned aturon Oct 8, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2018

alexcrichton requested a review from Mark-Simulacrum October 8, 2018 19:59

rust-highfive assigned Mark-Simulacrum and unassigned aturon Oct 8, 2018

Mark-Simulacrum reviewed Oct 8, 2018

View reviewed changes

alexcrichton force-pushed the update-cargo branch from d339359 to 9156ef5 Compare October 8, 2018 21:57