From 907e1fbb87057706a26bb708a2e4bdce64495dbe587d2a6bfb9930d4ef3c1c5c Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 26 Apr 2023 06:26:30 +0000 Subject: [PATCH] Accepting request 1082853 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/1082853 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust1.68?expand=0&rev=8 --- rust1.68.changes | 5 +++++ rust1.68.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/rust1.68.changes b/rust1.68.changes index 8ea168c..98f7c91 100644 --- a/rust1.68.changes +++ b/rust1.68.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 05:09:50 UTC 2023 - William Brown + +- Disable fdupes on SLE/Leap due to incorrect debuginfo extraction + ------------------------------------------------------------------- Tue Mar 28 02:30:57 UTC 2023 - William Brown diff --git a/rust1.68.spec b/rust1.68.spec index b0629c2..1262dcb 100644 --- a/rust1.68.spec +++ b/rust1.68.spec @@ -260,7 +260,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 @@ -623,7 +626,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-