From 9a3b9f438ca2b28187ff83f66303cb6bb0e6eb87 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:10:44 +0000 Subject: [PATCH] sys-fs/udisks: Sync with Gentoo It's from Gentoo commit 9beb3603370dd02782f9bf975da0edf9c353d234. --- ...disks-2.10.1-slibtool-export-dynamic.patch | 58 +++++++++++++++++++ .../sys-fs/udisks/udisks-2.10.1-r1.ebuild | 2 + 2 files changed, 60 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch new file mode 100644 index 0000000000..a9b48942ab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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 +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/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild index d0175b0d78..80826755a2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/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() {