summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-04-10 21:13:10 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-04-10 21:29:11 +0200
commit92895a39a8deb689e5e8d663dddcb257d97a7bb7 (patch)
treeb97aee6b87f549528699a550d3f011043049443d /sys-apps/util-linux
parentdev-libs/xmlsec: use HTTPS (diff)
downloadgentoo-92895a39a8deb689e5e8d663dddcb257d97a7bb7.tar.gz
gentoo-92895a39a8deb689e5e8d663dddcb257d97a7bb7.tar.bz2
gentoo-92895a39a8deb689e5e8d663dddcb257d97a7bb7.zip
sys-apps/util-linux: Rev bump to add missing -lintl
Bugs: https://bugs.gentoo.org/652674 Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch38
-rw-r--r--sys-apps/util-linux/util-linux-2.32-r2.ebuild (renamed from sys-apps/util-linux/util-linux-2.32-r1.ebuild)4
2 files changed, 42 insertions, 0 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
new file mode 100644
index 000000000000..8cca093d7cb4
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
@@ -0,0 +1,38 @@
+From 3188ea9a9292604e537f06f11adddf474fc9e52d Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 9 Apr 2018 12:11:36 +0200
+Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid}
+
+Addresses: https://github.com/karelzak/util-linux/pull/615
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libsmartcols/src/Makemodule.am | 2 +-
+ libuuid/src/Makemodule.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
+index 664aca30b..665b2aa7f 100644
+--- a/libsmartcols/src/Makemodule.am
++++ b/libsmartcols/src/Makemodule.am
+@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \
+ libsmartcols/src/version.c \
+ libsmartcols/src/init.c
+
+-libsmartcols_la_LIBADD = libcommon.la
++libsmartcols_la_LIBADD = $(LDADD) libcommon.la
+
+ libsmartcols_la_CFLAGS = \
+ $(AM_CFLAGS) \
+diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
+index 5122622a5..e58fa261c 100644
+--- a/libuuid/src/Makemodule.am
++++ b/libuuid/src/Makemodule.am
+@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \
+ EXTRA_libuuid_la_DEPENDENCIES = \
+ libuuid/src/libuuid.sym
+
+-libuuid_la_LIBADD = $(SOCKET_LIBS)
++libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS)
+
+ libuuid_la_CFLAGS = \
+ $(AM_CFLAGS) \
diff --git a/sys-apps/util-linux/util-linux-2.32-r1.ebuild b/sys-apps/util-linux/util-linux-2.32-r2.ebuild
index 6d113163470f..b616055b9349 100644
--- a/sys-apps/util-linux/util-linux-2.32-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r2.ebuild
@@ -68,6 +68,10 @@ pkg_setup() {
src_prepare() {
default
+ eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
+ touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
+ touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
+
# Prevent uuidd test failure due to socket path limit. #593304
sed -i \
-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \