From ba039d306e1044f8ba650538c73e8d58a353477a Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sun, 4 Feb 2024 15:14:18 +0900 Subject: [PATCH] app-crypt/rpm-sequoia: set DT_SONAME on musl build Closes: https://bugs.gentoo.org/923735 Signed-off-by: Takuya Wakazono --- .../files/cdylib-link-lines-0.1.4-musl.patch | 14 ++++++++++++++ ...ia-1.6.0.ebuild => rpm-sequoia-1.6.0-r1.ebuild} | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 app-crypt/rpm-sequoia/files/cdylib-link-lines-0.1.4-musl.patch rename app-crypt/rpm-sequoia/{rpm-sequoia-1.6.0.ebuild => rpm-sequoia-1.6.0-r1.ebuild} (97%) diff --git a/app-crypt/rpm-sequoia/files/cdylib-link-lines-0.1.4-musl.patch b/app-crypt/rpm-sequoia/files/cdylib-link-lines-0.1.4-musl.patch new file mode 100644 index 000000000000..18357f6c1b46 --- /dev/null +++ b/app-crypt/rpm-sequoia/files/cdylib-link-lines-0.1.4-musl.patch @@ -0,0 +1,14 @@ +Set DT_SONAME on musl. +https://bugs.gentoo.org/923735 +https://github.com/lu-zero/cdylib-link-lines/pull/10 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -57,7 +57,7 @@ pub fn shared_object_link_args( + lines.push(format!("-Wl,-soname,lib{}.so", name)); + } + +- ("linux", _) | ("freebsd", _) | ("dragonfly", _) | ("netbsd", _) if env != "musl" => { ++ ("linux", _) | ("freebsd", _) | ("dragonfly", _) | ("netbsd", _) => { + lines.push(format!("-Wl,-soname,lib{}.so.{}", name, major)); + } + diff --git a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild similarity index 97% rename from app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild rename to app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild index e504bb1f0abc..d69f14ea32f2 100644 --- a/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0.ebuild +++ b/app-crypt/rpm-sequoia/rpm-sequoia-1.6.0-r1.ebuild @@ -276,6 +276,12 @@ llvm_check_deps() { fi } +src_prepare() { + default + cd "${ECARGO_VENDOR}/cdylib-link-lines-0.1.4" || die + eapply "${FILESDIR}/cdylib-link-lines-0.1.4-musl.patch" +} + src_configure() { local myfeatures=( $(usev nettle crypto-nettle) -- 2.43.0