summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2022-02-03 09:45:20 +0100
committerJakov Smolić <jsmolic@gentoo.org>2022-02-03 09:46:52 +0100
commitbfd01260a3fbdeb541d67a6c8ab6f1d7df23e456 (patch)
tree7f22144c4670a23215b5611bae922adbe58732bf /sys-libs/pam
parentapp-vim/gentoo-syntax: Bump to 20220203 (diff)
downloadgentoo-bfd01260a3fbdeb541d67a6c8ab6f1d7df23e456.tar.gz
gentoo-bfd01260a3fbdeb541d67a6c8ab6f1d7df23e456.tar.bz2
gentoo-bfd01260a3fbdeb541d67a6c8ab6f1d7df23e456.zip
sys-libs/pam: Fix build on musl
Closes: https://bugs.gentoo.org/832573 Co-authored-by: Sam James <sam@gentoo.org> Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'sys-libs/pam')
-rw-r--r--sys-libs/pam/files/pam-1.5.1-musl.patch15
-rw-r--r--sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild6
-rw-r--r--sys-libs/pam/pam-1.5.2-r1.ebuild6
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-libs/pam/files/pam-1.5.1-musl.patch b/sys-libs/pam/files/pam-1.5.1-musl.patch
new file mode 100644
index 000000000000..a1d5b1543daf
--- /dev/null
+++ b/sys-libs/pam/files/pam-1.5.1-musl.patch
@@ -0,0 +1,15 @@
+Fix undefined reference to `libintl_dgettext` on musl
+Bug: https://bugs.gentoo.org/832573
+Upstream: https://github.com/linux-pam/linux-pam/pull/433
+
+--- a/libpam/Makefile.am
++++ b/libpam/Makefile.am
+@@ -21,7 +21,7 @@ noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \
+ include/pam_inline.h include/test_assert.h
+
+ libpam_la_LDFLAGS = -no-undefined -version-info 85:1:85
+-libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) $(ECONF_LIBS) @LIBDL@
++libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) $(ECONF_LIBS) @LIBDL@ @LTLIBINTL@
+
+ if HAVE_VERSIONING
+ libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map
diff --git a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild
index bbc95832d99a..98f33edbb60a 100644
--- a/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild
+++ b/sys-libs/pam/pam-1.5.1_p20210622-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -46,6 +46,10 @@ PDEPEND=">=sys-auth/pambase-20200616"
S="${WORKDIR}/linux-${PN}-${GIT_COMMIT}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.1-musl.patch
+)
+
src_prepare() {
default
touch ChangeLog || die
diff --git a/sys-libs/pam/pam-1.5.2-r1.ebuild b/sys-libs/pam/pam-1.5.2-r1.ebuild
index 77719a8fded9..41f8b3081e5a 100644
--- a/sys-libs/pam/pam-1.5.2-r1.ebuild
+++ b/sys-libs/pam/pam-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -45,6 +45,10 @@ PDEPEND=">=sys-auth/pambase-20200616"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.1-musl.patch
+)
+
src_prepare() {
default
touch ChangeLog || die