#66 Use make macros
Closed a year ago by vondruch. Opened a year ago by tstellar.
rpms/ tstellar/ruby make-macros  into  master

file modified
+7 -3
@@ -22,7 +22,7 @@ 

  %endif

  

  

- %global release 132

+ %global release 133

  %{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}

  

  # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -620,11 +620,11 @@ 

  

  # Q= makes the build output more verbose and allows to check Fedora

  # compiler options.

- make %{?_smp_mflags} COPY="cp -p" Q=

+ %make_build COPY="cp -p" Q=

  

  %install

  rm -rf %{buildroot}

- make install DESTDIR=%{buildroot}

+ %make_install

  

  # Rename ruby/config.h to ruby/config-<arch>.h to avoid file conflicts on

  # multilib systems and install config.h wrapper
@@ -1293,6 +1293,10 @@ 

  

  

  %changelog

+ * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.7.1-133

+ - Use make macros

+ - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

+ 

  * Wed Jun 24 2020 Jun Aruga <jaruga@redhat.com> - 2.7.1-132

  - Add ruby-default-gems dependency on irb.

    Resolves: rhbz#1850541

This pull request was create automatically for the f33 change:
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

Please review the patch and if you approve the changes, merge it after the simple-koji-ci test passes.

This pull request will be automatically merged in 1 week if there are not objections.

@tstellar LGTM, but @vondruch may have some additional insight.
Also there were changes since the PR was created, so rebase is needed. Also we could pick the changes manually ourselves.

It looks good to me, as far as I checked the macros.

<mock-chroot> sh-5.0# rpm -E %{?_smp_mflags}
-j8

<mock-chroot> sh-5.0# rpm -E %make_build
/usr/bin/make -O -j8 V=1 VERBOSE=1

<mock-chroot> sh-5.0# rpm -E %{buildroot}
/builddir/build/BUILDROOT/%{NAME}-%{VERSION}-%{RELEASE}.x86_64

<mock-chroot> sh-5.0# rpm -E %make_install
/usr/bin/make install DESTDIR=/builddir/build/BUILDROOT/%{NAME}-%{VERSION}-%{RELEASE}.x86_64 INSTALL="/usr/bin/install -p"

Apart from this PR, rm -rf %{buildroot} might not be needed any more on Fedora, checking the build.log.

 %install
rm -rf %{buildroot}

@tstellar I have cherry-picked this PR into the development branch of the future version of Ruby [1]. Closing this now and thx.

Pull-Request has been closed by vondruch

a year ago