From 3ec329b23401ac6f61ed1655c12e633548b9f349 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 17 Aug 2021 21:14:52 +0000 Subject: [PATCH] Add build_ prefix to cc, cxx, and cpp macros RPM requires macros to be at least 3 characters, so we need to rename the cc macro anyway and using the build_ prefix is consistent with other macros like build_cflags. --- macros | 6 +++--- redhat-rpm-config.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/macros b/macros index 5dcda6a..fccb744 100644 --- a/macros +++ b/macros @@ -68,9 +68,9 @@ # Compiler macros to use for invoking compilers in spec files for packages that # want to use the default compiler and don't care which compiler that is. -%cc %{__cc} -%cxx %{__cxx} -%cpp %{__cpp} +%build_cc %{__cc} +%build_cxx %{__cxx} +%build_cpp %{__cpp} #============================================================================== # ---- compiler flags. diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index e834b3a..8786a2f 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 196 +Version: 197 Release: 1%{?dist} # No version specified. License: GPL+ @@ -215,6 +215,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Aug 17 2021 Tom Stellard - 197-1 +- Add build_ preifix to cc, cxx, and cpp macros + * Mon Aug 16 2021 Tom Stellard - 196-1 - Add cc, cxx, and cpp macros