From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/
Date: Mon, 9 Dec 2024 05:16:17 +0000 (UTC) [thread overview]
Message-ID: <1733721342.9beb3603370dd02782f9bf975da0edf9c353d234.sam@gentoo> (raw)
commit: 9beb3603370dd02782f9bf975da0edf9c353d234
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sat Dec 7 21:51:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 9 05:15:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9beb3603
sys-fs/udisks: fix build with slibtool
Upstream: https://github.com/storaged-project/udisks/pull/1333
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/39630
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../udisks-2.10.1-slibtool-export-dynamic.patch | 58 ++++++++++++++++++++++
sys-fs/udisks/udisks-2.10.1-r1.ebuild | 2 +
2 files changed, 60 insertions(+)
diff --git a/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch b/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch
new file mode 100644
index 000000000000..a9b48942ab72
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch
@@ -0,0 +1,58 @@
+Upstream: https://github.com/storaged-project/udisks/pull/1333
+
+From d5f0bc5aa005d116b513992a6ae8ee1fd2dd65a1 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sat, 7 Dec 2024 16:45:40 -0500
+Subject: [PATCH] build: use -export-dynamic instead of -export_dynamic
+
+GNU libtool accepts either, but slibtool's option parsing is more strict
+and just ends up passing -export_dynamic to the compiler, which
+obviously causes an error. Use -export-dynamic to fix building with
+slibtool.
+--- a/modules/btrfs/Makefile.am
++++ b/modules/btrfs/Makefile.am
+@@ -64,7 +64,7 @@ libudisks2_btrfs_la_CFLAGS = \
+ $(NULL)
+
+ libudisks2_btrfs_la_LDFLAGS = \
+- -export_dynamic \
++ -export-dynamic \
+ -avoid-version \
+ -module \
+ -no-undefined \
+--- a/modules/iscsi/Makefile.am
++++ b/modules/iscsi/Makefile.am
+@@ -68,7 +68,7 @@ libudisks2_iscsi_la_CFLAGS = \
+ $(NULL)
+
+ libudisks2_iscsi_la_LDFLAGS = \
+- -export_dynamic \
++ -export-dynamic \
+ -avoid-version \
+ -module \
+ -no-undefined \
+--- a/modules/lsm/Makefile.am
++++ b/modules/lsm/Makefile.am
+@@ -62,7 +62,7 @@ libudisks2_lsm_la_CFLAGS = \
+ $(NULL)
+
+ libudisks2_lsm_la_LDFLAGS = \
+- -export_dynamic \
++ -export-dynamic \
+ -avoid-version \
+ -module \
+ -no-undefined \
+--- a/modules/lvm2/Makefile.am
++++ b/modules/lvm2/Makefile.am
+@@ -67,7 +67,7 @@ libudisks2_lvm2_la_CFLAGS = \
+ $(NULL)
+
+ libudisks2_lvm2_la_LDFLAGS = \
+- -export_dynamic \
++ -export-dynamic \
+ -avoid-version \
+ -module \
+ -no-undefined \
+--
+2.47.1
+
diff --git a/sys-fs/udisks/udisks-2.10.1-r1.ebuild b/sys-fs/udisks/udisks-2.10.1-r1.ebuild
index d0175b0d780f..80826755a29f 100644
--- a/sys-fs/udisks/udisks-2.10.1-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.10.1-r1.ebuild
@@ -66,6 +66,8 @@ PATCHES=(
"${FILESDIR}"/${P}-targetcli_config.json_netif_timeout.patch
"${FILESDIR}"/${P}-udiskslinuxmanager_use_after_free.patch
"${FILESDIR}"/${P}-udiskslinuxblock_survive_missing_fstab.patch
+
+ "${FILESDIR}"/${PN}-2.10.1-slibtool-export-dynamic.patch
)
pkg_setup() {
next reply other threads:[~2024-12-09 5:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-09 5:16 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-11-16 20:20 [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/ Mike Frysinger
2016-04-20 3:10 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1733721342.9beb3603370dd02782f9bf975da0edf9c353d234.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox