Skip to content

Commit 17c0470

Browse files
committed
Add dependencies for new pacman
1 parent 0a5aa11 commit 17c0470

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/compilation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
- name: Install dependencies Alpine
2222
if: matrix.os[0] == 'alpine'
2323
run: |
24-
apk add --no-cache build-base bash gcc git make autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev gpgme-dev \
24+
apk add --no-cache build-base bash gcc git make autoconf automake meson ninja-build pacman cmake pkgconfig libarchive-dev openssl-dev gpgme-dev \
2525
libtool flex bison texinfo gmp-dev mpfr-dev mpc1-dev readline-dev ncurses-dev gawk
2626
2727
- name: Install dependencies Fedora
2828
if: matrix.os[0] == 'fedora'
2929
run: |
30-
dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake python3 python3-pip make cmake pkgconf \
30+
dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake meson ninja-build makepkg make cmake pkgconf \
3131
libarchive-devel openssl-devel gpgme-devel libtool gettext texinfo bison flex gmp-devel mpfr-devel libmpc-devel ncurses-devel \
3232
diffutils glibc-gconv-extra xz gawk file
3333

prepare.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if [ "$(uname -s)" = "Darwin" ]; then
77
## Check if using brew
88
if command -v brew &> /dev/null; then
99
brew update
10-
brew install gettext texinfo bison flex gnu-sed ncurses gsl gmp mpfr autoconf automake cmake libusb-compat libarchive gpgme bash openssl libtool zlib
10+
brew install gettext texinfo bison flex gnu-sed ncurses gsl gmp mpfr autoconf automake cmake libusb-compat libarchive gpgme bash openssl libtool zlib
1111
brew reinstall openssl # https://github.com/Homebrew/homebrew-core/issues/169728#issuecomment-2074958306
1212
fi
1313
## Check if using MacPorts
@@ -23,20 +23,20 @@ else
2323
ubuntu | debian)
2424
sudo apt-get update
2525
sudo apt-get -y install build-essential cmake git wget texinfo bison flex gettext libtool libgsl-dev libgmp3-dev libmpfr-dev libmpc-dev libusb-dev libreadline-dev libcurl4 \
26-
libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev libz-dev python3 python3-pip python3-venv
26+
libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev libz-dev meson ninja-build makepkg
2727
;;
2828
rhel | fedora)
29-
dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake python3 python3-pip make cmake pkgconf \
29+
dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake meson ninja-build makepkg make cmake pkgconf \
3030
libarchive-devel openssl-devel gpgme-devel libtool gettext texinfo bison flex gmp-devel mpfr-devel libmpc-devel ncurses-devel diffutils \
3131
libusb-compat-0.1-devel readline-devel libcurl-devel which glibc-gconv-extra xz gawk file
3232
;;
3333
gentoo)
3434
sudo emerge --noreplace net-misc/wget dev-vcs/git dev-python/pip sys-apps/fakeroot \
3535
app-arch/libarchive app-crypt/gpgme sys-devel/bison sys-devel/flex\
36-
dev-libs/mpc dev-libs/libusb-compat
36+
dev-libs/mpc dev-libs/libusb-compat dev-build/meson dev-build/ninja
3737
;;
3838
arch)
39-
sudo pacman -Sy gcc clang make cmake patch git texinfo flex bison gettext wget gsl gmp mpfr libmpc libusb readline libarchive gpgme bash openssl libtool libusb-compat boost python-pip
39+
sudo pacman -Sy gcc clang make cmake patch git texinfo flex bison gettext wget gsl gmp mpfr libmpc libusb readline libarchive gpgme bash openssl libtool libusb-compat boost meson ninja
4040
;;
4141
*)
4242
echo "$TESTOS not supported here"

0 commit comments

Comments
 (0)