From 5b23603633cfebd6f0755c1236960e401a48a305525cdcc14ef4165c0b1e8779 Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 26 Apr 2023 06:26:26 +0000 Subject: [PATCH] Accepting request 1082852 from home:firstyear:branches:devel:languages:rust - Disable fdupes on SLE/Leap due to incorrect debuginfo extraction OBS-URL: https://build.opensuse.org/request/show/1082852 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust1.69?expand=0&rev=3 --- rust1.69.changes | 5 +++++ rust1.69.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/rust1.69.changes b/rust1.69.changes index 89de614..602d1d1 100644 --- a/rust1.69.changes +++ b/rust1.69.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 05:10:35 UTC 2023 - William Brown + +- Disable fdupes on SLE/Leap due to incorrect debuginfo extraction + ------------------------------------------------------------------- Fri Apr 21 00:01:39 UTC 2023 - William Brown diff --git a/rust1.69.spec b/rust1.69.spec index de7ed82..e920e66 100644 --- a/rust1.69.spec +++ b/rust1.69.spec @@ -261,7 +261,10 @@ Patch0: ignore-Wstring-conversion.patch BuildRequires: chrpath BuildRequires: curl +# BUG - fdupes on leap/sle causes issues with debug info +%if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1550 BuildRequires: fdupes +%endif BuildRequires: pkgconfig BuildRequires: procps BuildRequires: python3-base @@ -618,7 +621,9 @@ if [ ! -f %{buildroot}%{_libexecdir}/cargo-credential-1password ] && fi # Silence any duplicate library warnings. +%if 0%{?is_opensuse} == 1 && 0%{?suse_version} >= 1550 %fdupes %{buildroot}/%{common_libdir} +%endif # Ugly hack to get brp-15-strip-debug call llvm-strip, which is wasm-aware, as system-strip will break wasm-files (same for ar/ranlib) export CROSS_COMPILE=llvm-