diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index 8dccb4c..b92b2f9 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -21,13 +21,13 @@ jobs: - name: Install dependencies Alpine if: matrix.os[0] == 'alpine' run: | - apk add --no-cache build-base bash gcc git make autoconf automake python3 py3-pip cmake pkgconfig libarchive-dev openssl-dev gpgme-dev \ + apk add --no-cache build-base bash gcc git make autoconf automake meson ninja-build pacman cmake pkgconfig libarchive-dev openssl-dev gpgme-dev \ libtool flex bison texinfo gmp-dev mpfr-dev mpc1-dev readline-dev ncurses-dev gawk - name: Install dependencies Fedora if: matrix.os[0] == 'fedora' run: | - dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake python3 python3-pip make cmake pkgconf \ + dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake meson ninja-build makepkg make cmake pkgconf \ libarchive-devel openssl-devel gpgme-devel libtool gettext texinfo bison flex gmp-devel mpfr-devel libmpc-devel ncurses-devel \ diffutils glibc-gconv-extra xz gawk file diff --git a/prepare.sh b/prepare.sh index 72faff3..f239546 100755 --- a/prepare.sh +++ b/prepare.sh @@ -7,7 +7,7 @@ if [ "$(uname -s)" = "Darwin" ]; then ## Check if using brew if command -v brew &> /dev/null; then brew update - brew install gettext texinfo bison flex gnu-sed ncurses gsl gmp mpfr autoconf automake cmake libusb-compat libarchive gpgme bash openssl libtool zlib + brew install gettext texinfo bison flex gnu-sed ncurses gsl gmp mpfr autoconf automake cmake libusb-compat libarchive gpgme bash openssl libtool zlib makepkg meson ninja brew reinstall openssl # https://github.com/Homebrew/homebrew-core/issues/169728#issuecomment-2074958306 fi ## Check if using MacPorts @@ -23,20 +23,20 @@ else ubuntu | debian) sudo apt-get update 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 \ - libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev libz-dev python3 python3-pip python3-venv + libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev libz-dev meson ninja-build makepkg ;; rhel | fedora) - dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake python3 python3-pip make cmake pkgconf \ + dnf -y install @development-tools gcc gcc-c++ g++ wget git autoconf automake meson ninja-build makepkg make cmake pkgconf \ libarchive-devel openssl-devel gpgme-devel libtool gettext texinfo bison flex gmp-devel mpfr-devel libmpc-devel ncurses-devel diffutils \ libusb-compat-0.1-devel readline-devel libcurl-devel which glibc-gconv-extra xz gawk file ;; gentoo) sudo emerge --noreplace net-misc/wget dev-vcs/git dev-python/pip sys-apps/fakeroot \ app-arch/libarchive app-crypt/gpgme sys-devel/bison sys-devel/flex\ - dev-libs/mpc dev-libs/libusb-compat + dev-libs/mpc dev-libs/libusb-compat dev-build/meson dev-build/ninja ;; arch) - 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 + 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 ;; *) echo "$TESTOS not supported here"