Skip to content

Commit 5c5bea3

Browse files
laanwjcodablock
authored andcommitted
Merge bitcoin#13171: Change gitian-descriptors to use bionic instead
c1afe32 Change gitian-descriptors to use bionic instead (Chun Kuan Lee) Pull request description: I have tested this with Ubuntu Bionic host with lxc 3.0.0, the gitian-build for Windows and MacOSX work fine, but there is an issue about it for Linux. Failed at check-symbol: ``` test/test_bitcoin: symbol __divmoddi4 from unsupported version GCC_7.0.0 test/test_bitcoin: symbol log2f from unsupported version GLIBC_2.27 qt/bitcoin-qt: symbol __divmoddi4 from unsupported version GCC_7.0.0 qt/bitcoin-qt: symbol log2f from unsupported version GLIBC_2.27 ``` I think this should be fixed in `./configure --enable-glibc-back-compat` Should not be merged before bitcoin#13177 devrandom/gitian-builder#178 Close bitcoin#12511 Tree-SHA512: 257d75d5b6864e105279f7a7b992fbbd7903cdbe3300b66dacec0a783d267707d9dbbfe0e64a36983ca1eca50a2a5e1cdb222b6d3745ccc3e5fc5636c88b581f
1 parent 7cf9572 commit 5c5bea3

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

contrib/gitian-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ then
259259
if [[ -n "$USE_LXC" ]]
260260
then
261261
sudo apt-get install lxc
262-
bin/make-base-vm --suite trusty --arch amd64 --lxc
262+
bin/make-base-vm --suite bionic --arch amd64 --lxc
263263
elif [[ -n "$USE_DOCKER" ]]
264264
then
265265
sudo apt-get install docker-ce
266-
bin/make-base-vm --suite trusty --arch amd64 --docker
266+
bin/make-base-vm --suite bionic --arch amd64 --docker
267267
else
268-
bin/make-base-vm --suite trusty --arch amd64
268+
bin/make-base-vm --suite bionic --arch amd64
269269
fi
270270
popd
271271
fi

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
name: "dash-linux-0.12"
33
enable_cache: true
44
suites:
5-
- "trusty"
5+
- "bionic"
66
architectures:
77
- "amd64"
88
packages:
99
- "curl"
1010
- "g++-aarch64-linux-gnu"
11-
- "g++-4.8-aarch64-linux-gnu"
12-
- "gcc-4.8-aarch64-linux-gnu"
11+
- "g++-7-aarch64-linux-gnu"
12+
- "gcc-7-aarch64-linux-gnu"
1313
- "binutils-aarch64-linux-gnu"
1414
- "g++-arm-linux-gnueabihf"
15-
- "g++-4.8-arm-linux-gnueabihf"
16-
- "gcc-4.8-arm-linux-gnueabihf"
15+
- "g++-7-arm-linux-gnueabihf"
16+
- "gcc-7-arm-linux-gnueabihf"
1717
- "binutils-arm-linux-gnueabihf"
18-
- "g++-4.8-multilib"
19-
- "gcc-4.8-multilib"
18+
- "g++-7-multilib"
19+
- "gcc-7-multilib"
2020
- "binutils-gold"
21-
- "git-core"
21+
- "git"
2222
- "pkg-config"
2323
- "autoconf"
2424
- "libtool"

contrib/gitian-descriptors/gitian-osx-signer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "dash-dmg-signer"
33
suites:
4-
- "trusty"
4+
- "bionic"
55
architectures:
66
- "amd64"
77
packages:

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
name: "dash-osx-0.12"
33
enable_cache: true
44
suites:
5-
- "trusty"
5+
- "bionic"
66
architectures:
77
- "amd64"
88
packages:
99
- "ca-certificates"
1010
- "curl"
1111
- "g++"
12-
- "git-core"
12+
- "git"
1313
- "pkg-config"
1414
- "autoconf"
1515
- "librsvg2-bin"

contrib/gitian-descriptors/gitian-win-signer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "dash-win-signer"
33
suites:
4-
- "trusty"
4+
- "bionic"
55
architectures:
66
- "amd64"
77
packages:

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
name: "dash-win-0.12"
33
enable_cache: true
44
suites:
5-
- "trusty"
5+
- "bionic"
66
architectures:
77
- "amd64"
88
packages:
99
- "curl"
1010
- "g++"
11-
- "git-core"
11+
- "git"
1212
- "pkg-config"
1313
- "autoconf"
1414
- "libtool"
@@ -22,6 +22,7 @@ packages:
2222
- "ca-certificates"
2323
- "python"
2424
- "python3"
25+
- "rename"
2526
remotes:
2627
- "url": "https://github.com/dashpay/dash.git"
2728
"dir": "dash"
@@ -30,7 +31,7 @@ script: |
3031
WRAP_DIR=$HOME/wrapped
3132
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
3233
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
33-
FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
34+
FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
3435
FAKETIME_PROGS="date makensis zip"
3536
HOST_CFLAGS="-O2 -g"
3637
HOST_CXXFLAGS="-O2 -g"
@@ -109,7 +110,7 @@ script: |
109110
for prog in gcc g++; do
110111
echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}
111112
echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}-${prog}
112-
echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
113+
echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
113114
echo '# Add the gcc version to the wrapper so that ccache takes this into account (we use CCACHE_COMPILERCHECK=content)' >> ${WRAP_DIR}/${i}-${prog}
114115
echo "# `${prog} --version | head -1`" >> ${WRAP_DIR}/${i}-${prog}
115116
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}

0 commit comments

Comments
 (0)