From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83351138334 for ; Sun, 19 May 2019 07:57:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79017E0784; Sun, 19 May 2019 07:57:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44E83E0784 for ; Sun, 19 May 2019 07:57:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56707344A80 for ; Sun, 19 May 2019 07:57:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C51B6566 for ; Sun, 19 May 2019 07:57:49 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1558252662.9fe2eda37e4c0a15e68dd3ad316a438018c4fd03.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild sys-fs/btrfs-progs/btrfs-progs-5.1.ebuild sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch X-VCS-Directories: sys-fs/btrfs-progs/ sys-fs/btrfs-progs/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 9fe2eda37e4c0a15e68dd3ad316a438018c4fd03 X-VCS-Branch: master Date: Sun, 19 May 2019 07:57:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cf0f02fa-73d8-4588-ba1d-6f53923eb71f X-Archives-Hash: a537a3e470646a45497f4dd6c43ce0e2 commit: 9fe2eda37e4c0a15e68dd3ad316a438018c4fd03 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun May 19 07:57:26 2019 +0000 Commit: Sergei Trofimovich gentoo 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 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 +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 +--- + 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 +