Fabio Valentini
2 years ago
parent
2839a4e815
commit
a15f0b73c0
@ -0,0 +1,33 @@
|
||||
From 3df6ad1259c1741656affc26512f81631e9148f5 Mon Sep 17 00:00:00 2001
|
||||
From: Maxwell G <maxwell@gtmx.me>
|
||||
Date: Mar 09 2023 20:44:10 +0000
|
||||
Subject: Correct %__rustc and %__rustdoc paths and docs
|
||||
|
||||
|
||||
%{_bindir} should not be used like this in specfiles or macros. It
|
||||
breaks flatpak builds.
|
||||
|
||||
Also, correct docstring copy-paste errors.
|
||||
|
||||
Relates: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies
|
||||
|
||||
---
|
||||
|
||||
diff --git a/macros.d/macros.rust b/macros.d/macros.rust
|
||||
index 1978f85..095cebc 100644
|
||||
--- a/macros.d/macros.rust
|
||||
+++ b/macros.d/macros.rust
|
||||
@@ -1,8 +1,8 @@
|
||||
-# __cargo_to_rpm: path to the default rustc executable
|
||||
-%__rustc %{_bindir}/rustc
|
||||
+# __rustc: path to the default rustc executable
|
||||
+%__rustc /usr/bin/rustc
|
||||
|
||||
-# __cargo_to_rpm: path to the default rustdoc executable
|
||||
-%__rustdoc %{_bindir}/rustdoc
|
||||
+# __rustdoc: path to the default rustdoc executable
|
||||
+%__rustdoc /usr/bin/rustdoc
|
||||
|
||||
# rustflags_opt_level: default optimization level
|
||||
#
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 8690145a30cb049b0d2bcc9288b388cb9f8bbda7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: May 19 2023 17:33:11 +0000
|
||||
Subject: cargo_license / cargo_license_summary: add "-Z avoid-dev-deps" arg
|
||||
|
||||
|
||||
Without this flag, the "cargo tree" command attempts to resolve
|
||||
dev-dependencies, even though the "no-dev" edge type is specified,
|
||||
but dev-dependencies might not be present in the environment if the
|
||||
package is being built with the check %bcond disabled.
|
||||
|
||||
---
|
||||
|
||||
diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo
|
||||
index 3785ea0..672ae06 100644
|
||||
--- a/macros.d/macros.cargo
|
||||
+++ b/macros.d/macros.cargo
|
||||
@@ -183,6 +183,7 @@ fi \
|
||||
%cargo_license(naf:)\
|
||||
%{shrink:\
|
||||
%{__cargo} tree \
|
||||
+ -Z avoid-dev-deps \
|
||||
--workspace \
|
||||
--offline \
|
||||
--edges no-build,no-dev,no-proc-macro \
|
||||
@@ -204,6 +205,7 @@ fi \
|
||||
%cargo_license_summary(naf:)\
|
||||
%{shrink:\
|
||||
%{__cargo} tree \
|
||||
+ -Z avoid-dev-deps \
|
||||
--workspace \
|
||||
--offline \
|
||||
--edges no-build,no-dev,no-proc-macro \
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From b9d6410bec50c3dfb9433fa5dc51efda1652299b Mon Sep 17 00:00:00 2001
|
||||
From: Maxwell G <maxwell@gtmx.me>
|
||||
Date: Mar 09 2023 21:02:01 +0000
|
||||
Subject: Correct macro docstring typos
|
||||
|
||||
|
||||
---
|
||||
|
||||
diff --git a/macros.d/macros.rust b/macros.d/macros.rust
|
||||
index 095cebc..9967804 100644
|
||||
--- a/macros.d/macros.rust
|
||||
+++ b/macros.d/macros.rust
|
||||
@@ -29,10 +29,10 @@
|
||||
# -Copt-level: set optimization level (default: highest optimization level)
|
||||
# -Cdebuginfo: set debuginfo verbosity (default: full debug information)
|
||||
# -Ccodegen-units: set number of parallel code generation units (default: 1)
|
||||
-# Cforce-frame-pointers: force inclusion of frame pointers (default: enabled
|
||||
+# -Cforce-frame-pointers: force inclusion of frame pointers (default: enabled
|
||||
# on x86_64 and aarch64 on Fedora 37+)
|
||||
#
|
||||
-# Additionally, sime linker flags are set which correspond to the default
|
||||
+# Additionally, some linker flags are set which correspond to the default
|
||||
# Fedora compiler flags for hardening and for embedding package versions into
|
||||
# compiled binaries.
|
||||
#
|
||||
|
||||
Loading…
Reference in new issue