build: Drop per-host faketime wrappers in gitian-linux build #19627

pull hebasto wants to merge 3 commits into bitcoin:master from hebasto:200729-fake changing 1 files +10 −76

hebasto commented at 2:32 PM on July 30, 2020: member

This PR is based on #19622, and the first two commits belong to #19622.

This is another step to removing libfaketime from gitian builds.
build: Clean and sort package list in gitian-linux.yml 1ba1496243

build: Drop old hack which is unneeded now

This hack is described in #8188. The current implementation was
introduced in #8315.

d3fe00d90d

build: Drop per-host faketime wrappers in gitian-linux build
Replaced with the --enable-determinism configure script option.
55f3f74bf9
fanquake added the label Build system on Jul 30, 2020
MarcoFalke commented at 2:34 PM on July 30, 2020: member

Concept ACK on removing code, assuming that everything is still correct
in contrib/gitian-descriptors/gitian-linux.yml:21 in 55f3f74bf9
```
  21 | -- "g++-8-aarch64-linux-gnu"
  22 | -- "g++-8-riscv64-linux-gnu"
  23 | +- "g++"
  24 | +- "g++-arm-linux-gnueabihf"
  25 | +- "g++-aarch64-linux-gnu"
  26 | +- "g++-riscv64-linux-gnu"
```
dongcarl commented at 6:21 PM on July 30, 2020:

Let's not remove the explicit -8 to be more explicit... We can use update-alternatives in the script to change the default gcc/g++ I think
dongcarl commented at 6:21 PM on July 30, 2020: member

Got some hashes you can post? :relaxed:

hebasto commented at 7:35 PM on July 30, 2020: member

@dongcarl

Got some hashes you can post?

1f6339377bcf2eb7f01233f730c8e36c07511c5a4be94a1bead96a9b2cb9aee0  bitcoin-55f3f74bf970-aarch64-linux-gnu-debug.tar.gz
8346d46076f47d39704ac7ab186a5bde4a9b549a8838ce925665f47b0f904dca  bitcoin-55f3f74bf970-aarch64-linux-gnu.tar.gz
c8ce9b2dd3c2d63cbab7d4757870999fb3900e0396d73b69f71b8c8a7c9f4caf  bitcoin-55f3f74bf970-arm-linux-gnueabihf-debug.tar.gz
d7a2aab88e81d9efe0b419944f1a97b8fb06f6aa08de4d96e1faefa13619b99d  bitcoin-55f3f74bf970-arm-linux-gnueabihf.tar.gz
7290e27027bd3e7a3fbbbb090d66838df401f80abd1868cb700152592892a6e5  bitcoin-55f3f74bf970-riscv64-linux-gnu-debug.tar.gz
3ec37df653eaaa504e2f1b02ab168093998e49e77d073978af8c80af11b54c47  bitcoin-55f3f74bf970-riscv64-linux-gnu.tar.gz
13c88bf1a3e38af78b5e6abebd9b2ed7c724d0dbd961339159f603ced0508df5  bitcoin-55f3f74bf970-x86_64-linux-gnu-debug.tar.gz
e65a8627729bfc578ca738bacca87ee1b7d692a9a50d022d563f182c83b14138  bitcoin-55f3f74bf970-x86_64-linux-gnu.tar.gz
2430de380ac7d943740ff1ce492a6a66e91da7071b4d381895ebf8400b4533ea  src/bitcoin-55f3f74bf970.tar.gz

dongcarl commented at 8:01 PM on July 30, 2020: member

@hebasto See: #19622 (comment)
DrahtBot commented at 8:27 PM on July 30, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #19622 (build: Drop ancient hack in gitian-linux descriptor by hebasto)
- #14066 (gitian-linux: Build binaries for 64-bit POWER by luke-jr)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
in contrib/gitian-descriptors/gitian-linux.yml:31 in 55f3f74bf9
```
  27 | @@ -41,8 +28,7 @@ script: |
  28 |  
  29 |    WRAP_DIR=$HOME/wrapped
  30 |    HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
  31 | -  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
  32 | -  FAKETIME_HOST_PROGS="gcc g++"
  33 | +  CONFIGFLAGS="--enable-determinism --enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
```
fanquake commented at 3:23 AM on July 31, 2020:

Passing --enable-determinism here isn't going to do anything, as that option currently only enables an additional linker argument when building for Windows.

hebasto commented at 9:58 AM on July 31, 2020:

:facepalm: indeed https://github.com/bitcoin/bitcoin/blob/a63a26f042134fa80356860c109edb25ac567552/configure.ac#L807-L811

hebasto commented at 10:00 AM on July 31, 2020:

Why do I observe deterministic builds without faketime wrappers?
hebasto closed this on Aug 2, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#19622 build: Drop ancient hack in gitian-linux descriptor

build: Drop per-host faketime wrappers in gitian-linux build #19627

Conflicts