* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/
@ 2024-12-09 5:16 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-12-09 5:16 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/
@ 2016-11-16 20:20 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2016-11-16 20:20 UTC (permalink / raw
To: gentoo-commits
commit: fdf00e407a5e6a674a07e983a8f2ce3f3b04185e
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 20:19:32 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 20:20:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf00e40
sys-fs/udisks: fix old SLOT=0 building w/newer glibc too #580230
sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch | 72 ++++++++++++++++++++++++
sys-fs/udisks/udisks-1.0.5-r1.ebuild | 3 +-
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
new file mode 100644
index 00000000..96ce943
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.5-sysmacros.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/580230
+https://bugs.freedesktop.org/95028
+
+From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 23:04:32 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+Linux C libraries are moving away from implicit includes of
+sys/sysmacros.h, so pull in this header directly in the files
+that use these funcs.
+
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -38,6 +38,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+--- a/src/device.c
++++ b/src/device.c
+@@ -28,6 +28,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+--- a/src/mount-monitor.c
++++ b/src/mount-monitor.c
+@@ -27,6 +27,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <mntent.h>
+--- a/src/probers/part-id.c
++++ b/src/probers/part-id.c
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+--- a/tools/udisks.c
++++ b/tools/udisks.c
+@@ -28,6 +28,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+--- a/tools/umount-udisks.c
++++ b/tools/umount-udisks.c
+@@ -28,6 +28,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/sys-fs/udisks/udisks-1.0.5-r1.ebuild b/sys-fs/udisks/udisks-1.0.5-r1.ebuild
index 5273b24..5404e75 100644
--- a/sys-fs/udisks/udisks-1.0.5-r1.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r1.ebuild
@@ -53,7 +53,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
"${FILESDIR}"/${PN}-1.0.4-revert-floppy.patch \
- "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch
+ "${FILESDIR}"/${PN}-1.0.5-stat-includes.patch \
+ "${FILESDIR}"/${PN}-1.0.5-sysmacros.patch
sed -i -e "s:/lib/udev:$(get_udevdir):" data/80-udisks.rules || die
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/
@ 2016-04-20 3:10 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2016-04-20 3:10 UTC (permalink / raw
To: gentoo-commits
commit: 8354698243e8f0318234ebcdc7749c0cde355679
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 03:10:15 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 03:10:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83546982
sys-fs/udisks: fix build w/newer glibc #580230
sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch | 83 ++++++++++++++++++++++++
sys-fs/udisks/udisks-2.1.7.ebuild | 1 +
2 files changed, 84 insertions(+)
diff --git a/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch b/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
new file mode 100644
index 0000000..a353835
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-2.1.7-sysmacros.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/580230
+https://bugs.freedesktop.org/95028
+
+From 245093a15abe985b1746603c00084cb972fb71ae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 23:04:32 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+Linux C libraries are moving away from implicit includes of
+sys/sysmacros.h, so pull in this header directly in the files
+that use these funcs.
+---
+ src/udiskslinuxfilesystem.c | 2 +-
+ src/udiskslinuxpartition.c | 1 +
+ src/udisksmountmonitor.c | 1 +
+ src/udisksstate.c | 1 +
+ tools/umount-udisks.c | 1 +
+ 5 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
+index 68f7c4d..67132ab 100644
+--- a/src/udiskslinuxfilesystem.c
++++ b/src/udiskslinuxfilesystem.c
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <mntent.h>
+-#include <sys/types.h>
++#include <sys/sysmacros.h>
+ #ifdef HAVE_ACL
+ #include <sys/acl.h>
+ #endif
+diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
+index bfee216..12b73bc 100644
+--- a/src/udiskslinuxpartition.c
++++ b/src/udiskslinuxpartition.c
+@@ -26,6 +26,7 @@
+ #include <grp.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/sysmacros.h>
+ #include <glib-unix.h>
+
+ #include <glib/gstdio.h>
+diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c
+index 891d118..eae6c02 100644
+--- a/src/udisksmountmonitor.c
++++ b/src/udisksmountmonitor.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <mntent.h>
+
+ #include <glib.h>
+diff --git a/src/udisksstate.c b/src/udisksstate.c
+index fc7451a..2eeaf44 100644
+--- a/src/udisksstate.c
++++ b/src/udisksstate.c
+@@ -25,6 +25,7 @@
+ #include <glib/gstdio.h>
+
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <linux/loop.h>
+diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
+index 8ce5fea..73ddea7 100644
+--- a/tools/umount-udisks.c
++++ b/tools/umount-udisks.c
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <string.h>
+
+--
+2.7.4
+
diff --git a/sys-fs/udisks/udisks-2.1.7.ebuild b/sys-fs/udisks/udisks-2.1.7.ebuild
index 71183f7..d91155c 100644
--- a/sys-fs/udisks/udisks-2.1.7.ebuild
+++ b/sys-fs/udisks/udisks-2.1.7.ebuild
@@ -65,6 +65,7 @@ pkg_setup() {
src_prepare() {
use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
+ epatch "${FILESDIR}"/${PN}-2.1.7-sysmacros.patch #580230
epatch_user
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-09 5:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-09 5:16 [gentoo-commits] repo/gentoo:master commit in: sys-fs/udisks/files/, sys-fs/udisks/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-11-16 20:20 Mike Frysinger
2016-04-20 3:10 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox