From 35bfff77d9c4b06e365bf19813f20068f2753851488295bb7610a2e3f347b302 Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 26 Apr 2023 06:26:34 +0000 Subject: [PATCH] Accepting request 1082854 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/1082854 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust1.67?expand=0&rev=6 --- rust1.67.changes | 5 +++++ rust1.67.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/rust1.67.changes b/rust1.67.changes index 221f870..5c8f214 100644 --- a/rust1.67.changes +++ b/rust1.67.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 04:15:15 UTC 2023 - William Brown + +- Disable fdupes on SLE/Leap due to incorrect debuginfo extraction + ------------------------------------------------------------------- Mon Feb 13 03:36:54 UTC 2023 - William Brown diff --git a/rust1.67.spec b/rust1.67.spec index 10f91f4..2347ddd 100644 --- a/rust1.67.spec +++ b/rust1.67.spec @@ -256,7 +256,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 @@ -619,7 +622,9 @@ if [ ! -f %{buildroot}%{_libexecdir}/rust-analyzer-proc-macro-srv ] && 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-