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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F256158090 for ; Wed, 11 May 2022 02:07:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44A66E03EC; Wed, 11 May 2022 02:07:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29FD6E03EC for ; Wed, 11 May 2022 02:07:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E65C334191D for ; Wed, 11 May 2022 02:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D5B73BF for ; Wed, 11 May 2022 02:07:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652234827.18950b1eba7d8fdf98cf2795092b9c062f6536ad.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/, sys-fs/udisks/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udisks/files/udisks-2.9.4-undefined.patch sys-fs/udisks/udisks-2.9.4.ebuild X-VCS-Directories: sys-fs/udisks/files/ sys-fs/udisks/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 18950b1eba7d8fdf98cf2795092b9c062f6536ad X-VCS-Branch: master Date: Wed, 11 May 2022 02:07:48 +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: f2d0d6a5-b397-4922-ab50-03ddc9ef9dcd X-Archives-Hash: 05330902e5974e27f523e3f709e672a0 commit: 18950b1eba7d8fdf98cf2795092b9c062f6536ad Author: orbea riseup net> AuthorDate: Tue May 10 23:48:52 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 11 02:07:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18950b1e sys-fs/udisks: Fix undefined references When building with slibtool the build fails with undefined references. This is because slibtool respects -no-undefined while GNU libtool silently ignores it. Adding the missing dependency fixes the issue. Bug: https://bugs.gentoo.org/782061 Upstream-PR: https://github.com/storaged-project/udisks/pull/978 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/25433 Signed-off-by: Sam James gentoo.org> sys-fs/udisks/files/udisks-2.9.4-undefined.patch | 30 ++++++++++++++++++++++++ sys-fs/udisks/udisks-2.9.4.ebuild | 9 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch new file mode 100644 index 000000000000..f87e145e82aa --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch @@ -0,0 +1,30 @@ +Upstream-PR: https://github.com/storaged-project/udisks/pull/978 +From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Tue, 10 May 2022 09:29:10 -0700 +Subject: [PATCH] modules/btrfs: Add missing dependency + +When building udisks with --enable-btrfs using slibtool instead of GNU +libtool the build will fail with undefined references. + +This is because of a missing dependency for libudisks2_btrfs_la_LIBADD +and GNU libtool will hide this issue by silently ignoring -no-undefined +while slibtool does not. + +Gentoo Bug: https://bugs.gentoo.org/782061 +--- + modules/btrfs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am +index ac8c941849..f96cd16186 100644 +--- a/modules/btrfs/Makefile.am ++++ b/modules/btrfs/Makefile.am +@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS = \ + $(NULL) + + libudisks2_btrfs_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild index 3112d930e977..a939ae965757 100644 --- a/sys-fs/udisks/udisks-2.9.4.ebuild +++ b/sys-fs/udisks/udisks-2.9.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils +inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils DESCRIPTION="Daemon providing interfaces to work with storage devices" HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" @@ -61,6 +61,10 @@ BDEPEND=" DOCS=( AUTHORS HACKING NEWS README.md ) +PATCHES=( + "${FILESDIR}/${P}-undefined.patch" # 782061 +) + pkg_setup() { # Listing only major arch's here to avoid tracking kernel's defconfig if use amd64 || use arm || use ppc || use ppc64 || use x86; then @@ -79,6 +83,9 @@ src_prepare() { if ! use systemd ; then sed -i -e 's:libsystemd-login:&disable:' configure || die fi + + # Added for bug # 782061 + eautoreconf } src_configure() {