mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-08-03 20:23:20 +02:00
Merge #13171: Change gitian-descriptors to use bionic instead
c1afe3232f
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 #13177 devrandom/gitian-builder#178
Close #12511
Tree-SHA512: 257d75d5b6864e105279f7a7b992fbbd7903cdbe3300b66dacec0a783d267707d9dbbfe0e64a36983ca1eca50a2a5e1cdb222b6d3745ccc3e5fc5636c88b581f
This commit is contained in:
@@ -256,13 +256,13 @@ then
|
|||||||
if [[ -n "$USE_LXC" ]]
|
if [[ -n "$USE_LXC" ]]
|
||||||
then
|
then
|
||||||
sudo apt-get install lxc
|
sudo apt-get install lxc
|
||||||
bin/make-base-vm --suite trusty --arch amd64 --lxc
|
bin/make-base-vm --suite bionic --arch amd64 --lxc
|
||||||
elif [[ -n "$USE_DOCKER" ]]
|
elif [[ -n "$USE_DOCKER" ]]
|
||||||
then
|
then
|
||||||
sudo apt-get install docker-ce
|
sudo apt-get install docker-ce
|
||||||
bin/make-base-vm --suite trusty --arch amd64 --docker
|
bin/make-base-vm --suite bionic --arch amd64 --docker
|
||||||
else
|
else
|
||||||
bin/make-base-vm --suite trusty --arch amd64
|
bin/make-base-vm --suite bionic --arch amd64
|
||||||
fi
|
fi
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
@@ -2,23 +2,23 @@
|
|||||||
name: "bitcoin-linux-0.17"
|
name: "bitcoin-linux-0.17"
|
||||||
enable_cache: true
|
enable_cache: true
|
||||||
suites:
|
suites:
|
||||||
- "trusty"
|
- "bionic"
|
||||||
architectures:
|
architectures:
|
||||||
- "amd64"
|
- "amd64"
|
||||||
packages:
|
packages:
|
||||||
- "curl"
|
- "curl"
|
||||||
- "g++-aarch64-linux-gnu"
|
- "g++-aarch64-linux-gnu"
|
||||||
- "g++-4.8-aarch64-linux-gnu"
|
- "g++-7-aarch64-linux-gnu"
|
||||||
- "gcc-4.8-aarch64-linux-gnu"
|
- "gcc-7-aarch64-linux-gnu"
|
||||||
- "binutils-aarch64-linux-gnu"
|
- "binutils-aarch64-linux-gnu"
|
||||||
- "g++-arm-linux-gnueabihf"
|
- "g++-arm-linux-gnueabihf"
|
||||||
- "g++-4.8-arm-linux-gnueabihf"
|
- "g++-7-arm-linux-gnueabihf"
|
||||||
- "gcc-4.8-arm-linux-gnueabihf"
|
- "gcc-7-arm-linux-gnueabihf"
|
||||||
- "binutils-arm-linux-gnueabihf"
|
- "binutils-arm-linux-gnueabihf"
|
||||||
- "g++-4.8-multilib"
|
- "g++-7-multilib"
|
||||||
- "gcc-4.8-multilib"
|
- "gcc-7-multilib"
|
||||||
- "binutils-gold"
|
- "binutils-gold"
|
||||||
- "git-core"
|
- "git"
|
||||||
- "pkg-config"
|
- "pkg-config"
|
||||||
- "autoconf"
|
- "autoconf"
|
||||||
- "libtool"
|
- "libtool"
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
name: "bitcoin-dmg-signer"
|
name: "bitcoin-dmg-signer"
|
||||||
suites:
|
suites:
|
||||||
- "trusty"
|
- "bionic"
|
||||||
architectures:
|
architectures:
|
||||||
- "amd64"
|
- "amd64"
|
||||||
packages:
|
packages:
|
||||||
|
@@ -2,14 +2,14 @@
|
|||||||
name: "bitcoin-osx-0.17"
|
name: "bitcoin-osx-0.17"
|
||||||
enable_cache: true
|
enable_cache: true
|
||||||
suites:
|
suites:
|
||||||
- "trusty"
|
- "bionic"
|
||||||
architectures:
|
architectures:
|
||||||
- "amd64"
|
- "amd64"
|
||||||
packages:
|
packages:
|
||||||
- "ca-certificates"
|
- "ca-certificates"
|
||||||
- "curl"
|
- "curl"
|
||||||
- "g++"
|
- "g++"
|
||||||
- "git-core"
|
- "git"
|
||||||
- "pkg-config"
|
- "pkg-config"
|
||||||
- "autoconf"
|
- "autoconf"
|
||||||
- "librsvg2-bin"
|
- "librsvg2-bin"
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
name: "bitcoin-win-signer"
|
name: "bitcoin-win-signer"
|
||||||
suites:
|
suites:
|
||||||
- "trusty"
|
- "bionic"
|
||||||
architectures:
|
architectures:
|
||||||
- "amd64"
|
- "amd64"
|
||||||
packages:
|
packages:
|
||||||
|
@@ -2,13 +2,13 @@
|
|||||||
name: "bitcoin-win-0.17"
|
name: "bitcoin-win-0.17"
|
||||||
enable_cache: true
|
enable_cache: true
|
||||||
suites:
|
suites:
|
||||||
- "trusty"
|
- "bionic"
|
||||||
architectures:
|
architectures:
|
||||||
- "amd64"
|
- "amd64"
|
||||||
packages:
|
packages:
|
||||||
- "curl"
|
- "curl"
|
||||||
- "g++"
|
- "g++"
|
||||||
- "git-core"
|
- "git"
|
||||||
- "pkg-config"
|
- "pkg-config"
|
||||||
- "autoconf"
|
- "autoconf"
|
||||||
- "libtool"
|
- "libtool"
|
||||||
@@ -21,6 +21,7 @@ packages:
|
|||||||
- "zip"
|
- "zip"
|
||||||
- "ca-certificates"
|
- "ca-certificates"
|
||||||
- "python"
|
- "python"
|
||||||
|
- "rename"
|
||||||
remotes:
|
remotes:
|
||||||
- "url": "https://github.com/bitcoin/bitcoin.git"
|
- "url": "https://github.com/bitcoin/bitcoin.git"
|
||||||
"dir": "bitcoin"
|
"dir": "bitcoin"
|
||||||
@@ -29,7 +30,7 @@ script: |
|
|||||||
WRAP_DIR=$HOME/wrapped
|
WRAP_DIR=$HOME/wrapped
|
||||||
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
|
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
|
||||||
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
|
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
|
||||||
FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
|
FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
|
||||||
FAKETIME_PROGS="date makensis zip"
|
FAKETIME_PROGS="date makensis zip"
|
||||||
HOST_CFLAGS="-O2 -g"
|
HOST_CFLAGS="-O2 -g"
|
||||||
HOST_CXXFLAGS="-O2 -g"
|
HOST_CXXFLAGS="-O2 -g"
|
||||||
@@ -84,7 +85,7 @@ script: |
|
|||||||
done
|
done
|
||||||
for prog in gcc g++; do
|
for prog in gcc g++; do
|
||||||
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
|
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
|
||||||
echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
|
echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
|
||||||
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
|
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
|
||||||
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
|
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
|
||||||
echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}
|
echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}
|
||||||
|
Reference in New Issue
Block a user