#4 Use macros when invoking for invoking make and gcc
Merged 4 years ago by ngompa. Opened 4 years ago by tstellar.
rpms/ tstellar/redhat-lsb macros  into  master

file modified
+7 -4
@@ -62,7 +62,7 @@ 

  Summary: Implementation of Linux Standard Base specification

  Name: redhat-lsb

  Version: 4.1

- Release: 49%{?dist}

+ Release: 50%{?dist}

  URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb

  Source0: https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{srcrelease}.tar.bz2

  Patch0: lsb-release-3.1-update-init-functions.patch
@@ -482,7 +482,7 @@ 

  

  %build

  cd lsb-release-%{upstreamlsbrelver}

- make

+ %make_build

  

  %pre

  # remove the extra symlink /bin/mailx -> /bin/mail
@@ -602,10 +602,10 @@ 

  # According to https://bugzilla.redhat.com/show_bug.cgi?id=232918 , the '-static' option

  # is imported against segfault error while running redhat_lsb_trigger

  %ifarch %{arm} aarch64

- gcc $RPM_OPT_FLAGS -Os -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \

+ %{__cc} $RPM_OPT_FLAGS -Os -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \

    -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE

  %else

- gcc $RPM_OPT_FLAGS -Os -static -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \

+ %{__cc} $RPM_OPT_FLAGS -Os -static -fno-stack-protector -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \

    -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE

  %endif

  install -p -m 700 redhat_lsb_trigger.%{_target_cpu} \
@@ -751,6 +751,9 @@ 

  

  

  %changelog

+ * Mon Feb 03 2020 Tom Stellard <tstellar@redhat.com> - 4.1-50

+ - Use macros when invoking for invoking make and gcc

+ 

  * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-49

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

  

Replace make with %{make_build} [1] and gcc with %{__cc}. These changes make
it easier for buildroots to insert extra arguments or use alternative tools.

[1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make

rebased onto cb128bf

4 years ago

rebased onto 2e2ba7a

4 years ago

Pull-Request has been merged by ngompa

4 years ago