| 1 |
commit: 18950b1eba7d8fdf98cf2795092b9c062f6536ad |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Tue May 10 23:48:52 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 11 02:07:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18950b1e |
| 7 |
|
| 8 |
sys-fs/udisks: Fix undefined references |
| 9 |
|
| 10 |
When building with slibtool the build fails with undefined references. |
| 11 |
This is because slibtool respects -no-undefined while GNU libtool |
| 12 |
silently ignores it. |
| 13 |
|
| 14 |
Adding the missing dependency fixes the issue. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/782061 |
| 17 |
Upstream-PR: https://github.com/storaged-project/udisks/pull/978 |
| 18 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 19 |
Closes: https://github.com/gentoo/gentoo/pull/25433 |
| 20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 21 |
|
| 22 |
sys-fs/udisks/files/udisks-2.9.4-undefined.patch | 30 ++++++++++++++++++++++++ |
| 23 |
sys-fs/udisks/udisks-2.9.4.ebuild | 9 ++++++- |
| 24 |
2 files changed, 38 insertions(+), 1 deletion(-) |
| 25 |
|
| 26 |
diff --git a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch |
| 27 |
new file mode 100644 |
| 28 |
index 000000000000..f87e145e82aa |
| 29 |
--- /dev/null |
| 30 |
+++ b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch |
| 31 |
@@ -0,0 +1,30 @@ |
| 32 |
+Upstream-PR: https://github.com/storaged-project/udisks/pull/978 |
| 33 |
+From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001 |
| 34 |
+From: orbea <orbea@××××××.net> |
| 35 |
+Date: Tue, 10 May 2022 09:29:10 -0700 |
| 36 |
+Subject: [PATCH] modules/btrfs: Add missing dependency |
| 37 |
+ |
| 38 |
+When building udisks with --enable-btrfs using slibtool instead of GNU |
| 39 |
+libtool the build will fail with undefined references. |
| 40 |
+ |
| 41 |
+This is because of a missing dependency for libudisks2_btrfs_la_LIBADD |
| 42 |
+and GNU libtool will hide this issue by silently ignoring -no-undefined |
| 43 |
+while slibtool does not. |
| 44 |
+ |
| 45 |
+Gentoo Bug: https://bugs.gentoo.org/782061 |
| 46 |
+--- |
| 47 |
+ modules/btrfs/Makefile.am | 1 + |
| 48 |
+ 1 file changed, 1 insertion(+) |
| 49 |
+ |
| 50 |
+diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am |
| 51 |
+index ac8c941849..f96cd16186 100644 |
| 52 |
+--- a/modules/btrfs/Makefile.am |
| 53 |
++++ b/modules/btrfs/Makefile.am |
| 54 |
+@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS = \ |
| 55 |
+ $(NULL) |
| 56 |
+ |
| 57 |
+ libudisks2_btrfs_la_LIBADD = \ |
| 58 |
++ $(top_builddir)/src/libudisks-daemon.la \ |
| 59 |
+ $(GLIB_LIBS) \ |
| 60 |
+ $(GIO_LIBS) \ |
| 61 |
+ $(GUDEV_LIBS) \ |
| 62 |
|
| 63 |
diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild |
| 64 |
index 3112d930e977..a939ae965757 100644 |
| 65 |
--- a/sys-fs/udisks/udisks-2.9.4.ebuild |
| 66 |
+++ b/sys-fs/udisks/udisks-2.9.4.ebuild |
| 67 |
@@ -2,7 +2,7 @@ |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
-inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils |
| 72 |
+inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils |
| 73 |
|
| 74 |
DESCRIPTION="Daemon providing interfaces to work with storage devices" |
| 75 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" |
| 76 |
@@ -61,6 +61,10 @@ BDEPEND=" |
| 77 |
|
| 78 |
DOCS=( AUTHORS HACKING NEWS README.md ) |
| 79 |
|
| 80 |
+PATCHES=( |
| 81 |
+ "${FILESDIR}/${P}-undefined.patch" # 782061 |
| 82 |
+) |
| 83 |
+ |
| 84 |
pkg_setup() { |
| 85 |
# Listing only major arch's here to avoid tracking kernel's defconfig |
| 86 |
if use amd64 || use arm || use ppc || use ppc64 || use x86; then |
| 87 |
@@ -79,6 +83,9 @@ src_prepare() { |
| 88 |
if ! use systemd ; then |
| 89 |
sed -i -e 's:libsystemd-login:&disable:' configure || die |
| 90 |
fi |
| 91 |
+ |
| 92 |
+ # Added for bug # 782061 |
| 93 |
+ eautoreconf |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
Archives