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

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     9fe2eda37e4c0a15e68dd3ad316a438018c4fd03
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 07:57:26 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 19 07:57:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe2eda3

sys-fs/btrfs-progs: apply LDFLAGS to libbtrfsutil.so, bug #686284

libbtrfs.so already has user's LDFLAGS applied.
The change also applies those to libbtrfsutil.so.

Reported-by: Michał Górny
Bug: https://bugs.gentoo.org/686284
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 ...-progs-5.1.ebuild => btrfs-progs-5.1-r1.ebuild} |  4 +++
 .../files/btrfs-progs-5.1-LDFLAGS.patch            | 37 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
similarity index 98%
rename from sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
index 4076d30d238..d8977bdf6b9 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
@@ -74,6 +74,10 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1-LDFLAGS.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
new file mode 100644
index 00000000000..fa1fe7a5ede
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
@@ -0,0 +1,37 @@
+https://github.com/kdave/btrfs-progs/pull/172
+https://bugs.gentoo.org/686284
+
+From 7cdb5de31e954416e740886d46809e4883c31ddc Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 19 May 2019 08:51:28 +0100
+Subject: [PATCH] Makefile: apply LDFLAGS to libbtrfsutil.so
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libbtrfs.so already has user's LDFLAGS applied.
+The change also applies those to libbtrfsutil.so.
+
+Reported-by: Michał Górny
+Bug: https://bugs.gentoo.org/686284
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index e25e256f..4c67d187 100644
+--- a/Makefile
++++ b/Makefile
+@@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
+ 
+ libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
+ 	@echo "    [LD]     $@"
+-	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
++	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) $(LDFLAGS) \
+ 		-shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
+ 
+ libbtrfsutil.a: $(libbtrfsutil_objects)
+-- 
+2.21.0
+