diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index ab9b51395ba..7f992bafc4a 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -33,7 +33,7 @@ jobs: sudo apt-get -qq update sudo apt-get -qq install makeself # https://github.com/crosstool-ng/crosstool-ng/blob/master/testing/docker/ubuntu21.10/Dockerfile - sudo apt-get -qq install build-essential autoconf bison flex gawk meson + sudo apt-get -qq install build-essential autoconf bison flex gawk sudo apt-get -qq install help2man libncurses5-dev libtool libtool-bin sudo apt-get -qq install python3-dev texinfo unzip - name: Install FPM diff --git a/tools/make-binaries b/tools/make-binaries index 23e593c24c3..98cd0121347 100755 --- a/tools/make-binaries +++ b/tools/make-binaries @@ -73,7 +73,7 @@ yaml_vsn='0.2.5' ssl_vsn='3.3.2' otp_vsn='26.2.5.4' elixir_vsn='1.17.2' -pam_vsn='1.7.0' +pam_vsn='1.6.1' png_vsn='1.6.43' jpeg_vsn='9f' webp_vsn='1.4.0' @@ -623,17 +623,12 @@ build_deps() info "Building Linux-PAM $pam_vsn for $arch ..." cd "$target_src_dir/$pam_dir" - mkdir build - CFLAGS="$CFLAGS -O3 -fPIC" meson setup \ - --prefix="$prefix" --includedir="$prefix/include/security" \ - -Dexamples=false \ - build - # --enable-static \ # what option replaces this? - # --disable-shared \ # what option replaces this? - # --enable-db=no \ # replace with option pam_userdb=disabled or some other? - meson compile -C build - meson test -C build - meson install -C build + $configure --prefix="$prefix" --includedir="$prefix/include/security" \ + --enable-static --disable-shared --disable-doc --disable-examples \ + --enable-db=no \ + CFLAGS="$CFLAGS -O3 -fPIC" + make + make install cd "$OLDPWD" info "Building libpng $png_vsn for $arch-$libc ..."