[projects/pld-builder.new] Use new _make_opts rpm macro for -Otarget.

arekm arekm at pld-linux.org
Sat Nov 1 17:31:47 CET 2014


commit a06220f8c6176022227fa59c7fa1b7f228433fc6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Nov 1 17:31:42 2014 +0100

    Use new _make_opts rpm macro for -Otarget.

 PLD_Builder/rpm_builder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 904bb0e..3c94a0b 100644
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -227,7 +227,7 @@ def build_rpm(r, b):
                 if r.max_jobs > 0:
                     max_jobs = max(min(config.max_jobs, r.max_jobs), 1)
                 cmd = "set -ex; : build-id: %(r_id)s; TMPDIR=%(tmpdir)s exec nice -n %(nice)s " \
-                    "rpmbuild -bb --define '_smp_mflags -j%(max_jobs)d' --define '__make /usr/bin/make -Otarget %%{?_smp_mflags}' --define '_pld_builder 1' %(rpmdefs)s %(topdir)s/%(spec)s" % {
+                    "rpmbuild -bb --define '_smp_mflags -j%(max_jobs)d' --define '_make_opts -Otarget' --define '_pld_builder 1' %(rpmdefs)s %(topdir)s/%(spec)s" % {
                     'r_id' : r.id,
                     'tmpdir': tmpdir,
                     'nice' : config.nice,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/a06220f8c6176022227fa59c7fa1b7f228433fc6



More information about the pld-cvs-commit mailing list