From dc5e3e301ba976b5e50276daef97b5dda32cd562 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 15 Dec 2022 13:53:57 +0100 Subject: [PATCH] disable LTO to work around LLVM crashes on ppc64le --- convert_case-fix-metadata.diff | 12 ++++++-- rust-convert_case.spec | 52 +++++++++++++++++----------------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/convert_case-fix-metadata.diff b/convert_case-fix-metadata.diff index 2bee3e4..71097e7 100644 --- a/convert_case-fix-metadata.diff +++ b/convert_case-fix-metadata.diff @@ -1,6 +1,14 @@ --- convert_case-0.4.0/Cargo.toml 2020-05-18T02:16:34+00:00 -+++ convert_case-0.4.0/Cargo.toml 2021-06-17T16:20:11.471912+00:00 -@@ -29,10 +29,10 @@ ++++ convert_case-0.4.0/Cargo.toml 2022-12-15T12:49:37.895777+00:00 +@@ -21,18 +21,14 @@ + categories = ["text-processing"] + license = "MIT" + repository = "https://github.com/rutrum/convert-case" +-[profile.release] +-lto = true +-codegen-units = 1 +-panic = "abort" + [dependencies.rand] version = "^0.7" optional = true [dev-dependencies.strum] diff --git a/rust-convert_case.spec b/rust-convert_case.spec index fea92dd..5708aab 100644 --- a/rust-convert_case.spec +++ b/rust-convert_case.spec @@ -1,29 +1,26 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate convert_case -Name: rust-%{crate} +Name: rust-convert_case Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Convert strings into any case -# Upstream license specification: MIT # https://github.com/rutrum/convert-case/commit/f72ca63 License: MIT URL: https://crates.io/crates/convert_case Source: %{crates_source} -# Initial patched metadata -# - Bump strum and strum_macros to 0.21.0 https://github.com/rutrum/convert-case/pull/3 -Patch0: convert_case-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * bump strum and strum_macros from 0.18 to 0.21.0: +# https://github.com/rutrum/convert-case/pull/3 +# * disable LTO to work around LLVM crashes on ppc64le: +# https://bugzilla.redhat.com/show_bug.cgi?id=2142648 +Patch: convert_case-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Convert strings into any case.} @@ -36,12 +33,12 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +46,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rand-devel Summary: %{summary} @@ -61,11 +58,11 @@ BuildArch: noarch %description -n %{name}+rand-devel %{_description} -This package contains library source intended for building other packages -which use "rand" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "rand" feature of the "%{crate}" crate. %files -n %{name}+rand-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+random-devel Summary: %{summary} @@ -73,11 +70,11 @@ BuildArch: noarch %description -n %{name}+random-devel %{_description} -This package contains library source intended for building other packages -which use "random" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "random" feature of the "%{crate}" crate. %files -n %{name}+random-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -98,6 +95,9 @@ which use "random" feature of "%{crate}" crate. %endif %changelog +* Thu Dec 15 2022 Fabio Valentini - 0.4.0-6 +- Disable LTO to work around LLVM crashes on ppc64le. + * Sat Jul 23 2022 Fedora Release Engineering - 0.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild