|
 |
5523e9 |
From 89df36524bace71decee4ab4f979d4ffb449c9a7 Mon Sep 17 00:00:00 2001
|
|
|
5523e9 |
From: Panu Matilainen <pmatilai@redhat.com>
|
|
|
5523e9 |
Date: Wed, 22 Jan 2014 10:56:00 +0200
|
|
|
5523e9 |
Subject: [PATCH] Add %make_build macro for hiding parallel-build magic from
|
|
|
5523e9 |
specs (ticket #115)
|
|
|
5523e9 |
|
|
|
5523e9 |
- This allows simplifying the make invokations from specs. In particular
|
|
|
5523e9 |
the parallel build options no longer need to be messed with from specs,
|
|
|
5523e9 |
and %__make can be overridden to force a different make implementation
|
|
|
5523e9 |
to be used throughout the spec.
|
|
|
5523e9 |
- While a lot of software builds correctly in parallel, there are always
|
|
|
5523e9 |
exceptions... together with _smp_ncpus_max macro this can now be
|
|
|
5523e9 |
expressed with a separate "%global _smp_ncpus_max 1" (or any other
|
|
|
5523e9 |
arbitrary value beyond which parallel build is buggy) line which
|
|
|
5523e9 |
is easy to grep for and experiment with.
|
|
|
5523e9 |
---
|
|
|
5523e9 |
macros.in | 4 ++++
|
|
|
5523e9 |
1 file changed, 4 insertions(+)
|
|
|
5523e9 |
|
|
|
5523e9 |
diff --git a/macros.in b/macros.in
|
|
|
5523e9 |
index 5a075a3..9c7a111 100644
|
|
|
5523e9 |
--- a/macros.in
|
|
|
5523e9 |
+++ b/macros.in
|
|
|
5523e9 |
@@ -861,6 +861,10 @@ package or when debugging this package.\
|
|
|
5523e9 |
--infodir=%{_infodir}
|
|
|
5523e9 |
|
|
|
5523e9 |
#------------------------------------------------------------------------------
|
|
|
5523e9 |
+# The "make" analogue, hiding the _smp_mflags magic from specs
|
|
|
5523e9 |
+%make_build %{__make} %{?_smp_mflags}
|
|
|
5523e9 |
+
|
|
|
5523e9 |
+#------------------------------------------------------------------------------
|
|
|
5523e9 |
# The make install analogue of %configure for modern autotools:
|
|
|
5523e9 |
%make_install %{__make} install DESTDIR=%{?buildroot}
|
|
|
5523e9 |
|
|
|
5523e9 |
--
|
|
|
5523e9 |
2.1.0
|
|
|
5523e9 |
|