File tree Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Expand file tree Collapse file tree 5 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ jobs:
105
105
run : |
106
106
# A workaround for "The `brew link` step did not complete successfully" error.
107
107
brew install --quiet python@3 || brew link --overwrite python@3
108
- brew install --quiet automake libtool pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode
108
+ brew install --quiet pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode
109
109
110
110
- name : Set Ccache directory
111
111
run : echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out}
64
64
# The folder for previous release binaries.
65
65
# This folder exists only on the ci guest, and on the ci host as a volume.
66
66
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:- $BASE_ROOT_DIR / prev_releases}
67
- export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:- build-essential libtool autotools-dev automake pkg-config curl ca-certificates ccache python3 rsync git procps bison e2fsprogs cmake}
67
+ export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:- build-essential pkg-config curl ca-certificates ccache python3 rsync git procps bison e2fsprogs cmake}
68
68
export GOAL=${GOAL:- install}
69
69
export DIR_QA_ASSETS=${DIR_QA_ASSETS:- ${BASE_SCRATCH_DIR} / qa-assets}
70
70
export CI_RETRY_EXE=${CI_RETRY_EXE:- " retry --" }
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
9
9
export HOST=i686-pc-linux-gnu
10
10
export CONTAINER_NAME=ci_i686_centos
11
11
export CI_IMAGE_NAME_TAG=" quay.io/centos/amd64:stream9"
12
- export CI_BASE_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux e2fsprogs cmake"
12
+ export CI_BASE_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux e2fsprogs cmake"
13
13
export PIP_PACKAGES=" pyzmq"
14
14
export GOAL=" install"
15
15
export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ usage() {
58
58
echo " Usage: $( basename " ${BASH_SOURCE[0]} " ) [BUILD_DIR]"
59
59
}
60
60
61
- # Output makefile targets, converting library .a paths to libtool .la targets
61
+ # Output makefile targets, converting library .a paths to CMake targets
62
62
lib_targets () {
63
63
for lib in " ${! LIBS[@]} " ; do
64
64
for lib_path in ${LIBS[$lib]} ; do
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ The paths are automatically configured and no other options are needed.
41
41
42
42
#### Common
43
43
44
- apt install automake bison cmake curl libtool make patch pkg-config python3 xz-utils
44
+ apt install bison cmake curl make patch pkg-config python3 xz-utils
45
45
46
46
#### For macOS cross compilation
47
47
You can’t perform that action at this time.
0 commit comments