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 CC6AE1382C5 for ; Thu, 12 Apr 2018 09:42:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7224E0896; Thu, 12 Apr 2018 09:42:07 +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 B3EA6E0896 for ; Thu, 12 Apr 2018 09:42:07 +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 C628B335C76 for ; Thu, 12 Apr 2018 09:42:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DD26274 for ; Thu, 12 Apr 2018 09:42:05 +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: <1523526118.665fca34ff359676b9ebe0f855f3716ad85be312.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.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: 665fca34ff359676b9ebe0f855f3716ad85be312 X-VCS-Branch: master Date: Thu, 12 Apr 2018 09:42:05 +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-Archives-Salt: d0bc767a-fc74-41a5-ae8c-3ae412333b91 X-Archives-Hash: 26ad0ff4f0bd98fb5e409295ed4f985b commit: 665fca34ff359676b9ebe0f855f3716ad85be312 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Apr 12 09:41:38 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Apr 12 09:41:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=665fca34 sys-fs/btrfs-progs: fix btrfs.static linking, bug #652966 btrfs.static was not linked against internal libbtrfsutil: https://www.spinics.net/lists/linux-btrfs/msg76763.html This caused link failure due to unresolved symbols. Reported-by: Attila Tóth Closes: https://bugs.gentoo.org/652966 Package-Manager: Portage-2.3.28, Repoman-2.3.9 sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild | 4 ++++ .../files/btrfs-progs-4.16-static-linkage.patch | 27 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild index 0936ade7591..8d3f9db2dd2 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild @@ -72,6 +72,10 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/${P}-static-linkage.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch new file mode 100644 index 00000000000..b8a7d8b79f0 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.16-static-linkage.patch @@ -0,0 +1,27 @@ +https://www.spinics.net/lists/linux-btrfs/msg76763.html +Reported-by: Attila Tóth +Bug: https://bugs.gentoo.org/652966 +diff --git a/Makefile b/Makefile +index 5ba76d2..dc3a31a 100644 +--- a/Makefile ++++ b/Makefile +@@ -264,6 +264,7 @@ static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects)) + static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects)) + static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects)) + static_image_objects = $(patsubst %.o, %.static.o, $(image_objects)) ++static_libbtrfsutil_objects = $(patsubst %.o, %.static.o, $(libbtrfsutil_objects)) + + libs_shared = libbtrfs.so.0.1 libbtrfsutil.so.$(libbtrfsutil_version) + libs_static = libbtrfs.a libbtrfsutil.a +@@ -453,7 +454,7 @@ btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static) + @echo " [LD] $@" + $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP) + +-btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) ++btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects) $(static_libbtrfsutil_objects) + @echo " [LD] $@" + $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP) + +-- +2.17.0 +