diff mbox series

spec: Use %make_install

Message ID c690de2ccd5777f163f030bcaf13ec4e69881933.1533051128.git.crobinso@redhat.com
State Accepted
Commit ff2bec49ecd404ea3c5b769a7a2105d1b3a9ccf8
Headers show
Series spec: Use %make_install | expand

Commit Message

Cole Robinson July 31, 2018, 3:42 p.m. UTC
It's on RHEL7, saves a bit of typing, and lets us drop the comment

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
There's also a %make_build macro which handles smp_mflags, but it uses
make -O which makes build output noisier at least

 libvirt.spec.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

-- 
2.17.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Martin Kletzander Aug. 8, 2018, 12:09 p.m. UTC | #1
On Tue, Jul 31, 2018 at 11:42:40AM -0400, Cole Robinson wrote:
>It's on RHEL7, saves a bit of typing, and lets us drop the comment

>


I tried it looks like it works.

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>


>Signed-off-by: Cole Robinson <crobinso@redhat.com>

>---

>There's also a %make_build macro which handles smp_mflags, but it uses

>make -O which makes build output noisier at least

>

> libvirt.spec.in | 5 +----

> 1 file changed, 1 insertion(+), 4 deletions(-)

>

>diff --git a/libvirt.spec.in b/libvirt.spec.in

>index 4113579e47..01f4e07b1c 100644

>--- a/libvirt.spec.in

>+++ b/libvirt.spec.in

>@@ -1255,10 +1255,7 @@ rm -fr %{buildroot}

>

> export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)

>

>-# Avoid using makeinstall macro as it changes prefixes rather than setting

>-# DESTDIR. Newer make_install macro would be better but it's not available

>-# on RHEL 5, thus we need to expand it here.

>-make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} V=1

>+%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1

>

> make %{?_smp_mflags} -C examples distclean V=1

>

>-- 

>2.17.1

>

>--

>libvir-list mailing list

>libvir-list@redhat.com

>https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
no-reply@patchew.org Aug. 13, 2018, 3:29 p.m. UTC | #2
Hi,

This series was run against 'syntax-check' test by patchew.org, which failed, please find the details below:

Type: series
Message-id: c690de2ccd5777f163f030bcaf13ec4e69881933.1533051128.git.crobinso@redhat.com
Subject: [libvirt] [PATCH] spec: Use %make_install

=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
time bash -c './autogen.sh && make syntax-check'
=== TEST SCRIPT END ===

Updating bcb55ab053bc79561b55d0394490f4b64e0f2d01
>From https://github.com/patchew-project/libvirt

 t [tag update]            patchew/c690de2ccd5777f163f030bcaf13ec4e69881933.1533051128.git.crobinso@redhat.com -> patchew/c690de2ccd5777f163f030bcaf13ec4e69881933.1533051128.git.crobinso@redhat.com
Switched to a new branch 'test'
fatal: Not a valid branch point: '9eae8398edde9446ecc99f4f393bea94652fb6a2'.
Traceback (most recent call last):
  File "patchew-tester/src/patchew-cli", line 523, in test_one
    cwd=clone, stdout=logf, stderr=logf)
  File "/usr/lib64/python3.6/subprocess.py", line 291, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'branch', 'base', '9eae8398edde9446ecc99f4f393bea94652fb6a2']' returned non-zero exit status 128.


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox series

Patch

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 4113579e47..01f4e07b1c 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1255,10 +1255,7 @@  rm -fr %{buildroot}
 
 export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
 
-# Avoid using makeinstall macro as it changes prefixes rather than setting
-# DESTDIR. Newer make_install macro would be better but it's not available
-# on RHEL 5, thus we need to expand it here.
-make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
+%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
 
 make %{?_smp_mflags} -C examples distclean V=1