Skip to content

Commit 98264e2

Browse files
committed
Merge #18104: build: Skip i686 build by default in guix and gitian
fae9084 build: Skip i686 build by default in guix and gitian (MarcoFalke) fa55a25 depends: Remove reference to win32 (MarcoFalke) Pull request description: Closes #17504 Now that we no longer provide downloads for i686 on our website (https://bitcoincore.org/en/download/), there is no need to build them by default. i686 can still be built in depends (tested by ci/travis) and in guix/gitian by setting the appropriate `HOSTS`. ACKs for top commit: practicalswift: ACK fae9084 -- patch looks correct dongcarl: ACK fae9084 patch looks correct laanwj: Code review ACK fae9084 hebasto: ACK fae9084, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: b000c19a2cd2a596a52028fa298c4022c24cfdfc1bdb3795a90916d0a00a32e4dd22278db93790b6a11724e08ea8451f4f05c77bc40d1664518e11a8c82d6e29
2 parents 35b7a8e + fae9084 commit 98264e2

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ script: |
4040
set -e -o pipefail
4141
4242
WRAP_DIR=$HOME/wrapped
43-
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
43+
HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
4444
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
4545
FAKETIME_HOST_PROGS="gcc g++"
4646
FAKETIME_PROGS="date ar ranlib nm"

contrib/guix/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ find output/ -type f -print0 | sort -z | xargs -r0 sha256sum
114114
* _**HOSTS**_
115115

116116
Override the space-separated list of platform triples for which to perform a
117-
bootstrappable build. _(defaults to "i686-linux-gnu x86\_64-linux-gnu
117+
bootstrappable build. _(defaults to "x86\_64-linux-gnu
118118
arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu")_
119119

120120
> Windows and OS X platform triplet support are WIP.

contrib/guix/guix-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ time-machine() {
2020
}
2121

2222
# Deterministically build Bitcoin Core for HOSTs (overriable by environment)
23-
for host in ${HOSTS=i686-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu}; do
23+
for host in ${HOSTS=x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu}; do
2424

2525
# Display proper warning when the user interrupts the build
2626
trap 'echo "** INT received while building ${host}, you may want to clean up the relevant output and distsrc-* directories before rebuilding"' INT

depends/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The paths are automatically configured and no other options are needed unless ta
4646

4747
sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils cmake imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools
4848

49-
#### For Win32/Win64 cross compilation
49+
#### For Win64 cross compilation
5050

5151
- see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux)
5252

doc/release-process.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ The list of files should be:
268268
```
269269
bitcoin-${VERSION}-aarch64-linux-gnu.tar.gz
270270
bitcoin-${VERSION}-arm-linux-gnueabihf.tar.gz
271-
bitcoin-${VERSION}-i686-pc-linux-gnu.tar.gz
272271
bitcoin-${VERSION}-riscv64-linux-gnu.tar.gz
273272
bitcoin-${VERSION}-x86_64-linux-gnu.tar.gz
274273
bitcoin-${VERSION}-osx64.tar.gz

0 commit comments

Comments
 (0)