File tree Expand file tree Collapse file tree 5 files changed +25
-35
lines changed
Expand file tree Collapse file tree 5 files changed +25
-35
lines changed Original file line number Diff line number Diff line change @@ -101,14 +101,9 @@ jobs:
101101 FILE_ENV="./ci/test/00_setup_env_win64.sh"
102102
103103 - stage : test
104- name : ' 32-bit + dash [GOAL: install] [gui]'
104+ name : ' 32-bit + dash [GOAL: install] [CentOS 7] [ gui]'
105105 env : >-
106- FILE_ENV="./ci/test/00_setup_env_i686.sh"
107-
108- - stage : test
109- name : ' x86_64 Linux [GOAL: install] [CentOS 7] [no depends, only system libs]'
110- env : >-
111- FILE_ENV="./ci/test/00_setup_env_native_centos.sh"
106+ FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
112107
113108 - stage : test
114109 name : ' x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package and some depends packages] [unsigned char]'
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+ #
3+ # Copyright (c) 2020 The Bitcoin Core developers
4+ # Distributed under the MIT software license, see the accompanying
5+ # file COPYING or http://www.opensource.org/licenses/mit-license.php.
6+
7+ export LC_ALL=C.UTF-8
8+
9+ export HOST=i686-pc-linux-gnu
10+ export DOCKER_NAME_TAG=centos:7
11+ export DOCKER_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python36-zmq which patch lbzip2 dash"
12+ export GOAL=" install"
13+ export BITCOIN_CONFIG=" --enable-zmq --with-gui=qt5 --enable-reduce-exports"
14+ export CONFIG_SHELL=" /bin/dash"
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -25,5 +25,13 @@ if [[ $HOST = *-mingw32 ]]; then
2525 DOCKER_EXEC update-alternatives --set $HOST -g++ \$\( which $HOST -g++-posix\)
2626fi
2727if [ -z " $NO_DEPENDS " ]; then
28- DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
28+ if [[ $DOCKER_NAME_TAG == centos* ]]; then
29+ # CentOS has problems building the depends if the config shell is not explicitely set
30+ # (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
31+ # an error as the first command is executed)
32+ SHELL_OPTS=" CONFIG_SHELL=/bin/bash"
33+ else
34+ SHELL_OPTS=" CONFIG_SHELL="
35+ fi
36+ DOCKER_EXEC $SHELL_OPTS make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
2937fi
You can’t perform that action at this time.
0 commit comments