Skip to content

Commit

Permalink
Revert "Bump Linux-PAM to 1.7.0 and try to update its compilation fro…
Browse files Browse the repository at this point in the history
…m autotools to meson"

This reverts commit b18a0b3.
  • Loading branch information
badlop committed Nov 12, 2024
1 parent a771b5a commit 6103236
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 7 additions & 12 deletions tools/make-binaries
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 ..."
Expand Down

0 comments on commit 6103236

Please sign in to comment.