[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     b931c4bb60647a80cd0748e4b3dd7ed3e20fc440
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 20:32:59 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 20:33:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b931c4bb

sys-fs/xfsprogs: Add fix for underlinking detected by ld.gold

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../files/xfsprogs-4.9.0-underlinking.patch        | 30 ++++++++++++++++++++++
 sys-fs/xfsprogs/metadata.xml                       |  8 +++---
 sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild              |  1 +
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
new file mode 100644
index 00000000..e6904a5
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
@@ -0,0 +1,30 @@
+ libxfs/Makefile  | 2 +-
+ libxlog/Makefile | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libxfs/Makefile b/libxfs/Makefile
+index 6499731..00447c4 100644
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
+ 
+ FCFLAGS = -I.
+ 
+-LTLIBS = $(LIBPTHREAD) $(LIBRT)
++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
+ 
+ # don't try linking xfs_repair with a debug libxfs.
+ DEBUG = -DNDEBUG
+diff --git a/libxlog/Makefile b/libxlog/Makefile
+index 3417eed..fda1343 100644
+--- a/libxlog/Makefile
++++ b/libxlog/Makefile
+@@ -12,6 +12,8 @@ LT_AGE = 0
+ 
+ CFILES = xfs_log_recover.c util.c
+ 
++LTLIBS = $(LIBUUID)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+ 

diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 56c1244..4eb20a0 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index 7227b27..907d464 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
 	"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
 	"${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
+	"${FILESDIR}"/${P}-underlinking.patch
 )
 
 pkg_setup() {