Skip to contentSkip to conversation

packages/exim: enable parallel make

PATCH New Luca Ceresoli 4 participants 6 messages Apr 20, 2020 – May 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 packages/exim: enable parallel make

Parallel make used to be broken in exim, as reported in its docs. Now that line has disappeared from the docs, and parallel make is actually working.

Tested with 'make exim-dirclean ; time make BR2_JLEVEL=999 exim': builds still succeed and the build time decreases from 34 to 11 seconds on my host.

---
 package/exim/exim.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
package/exim/exim.mk +4 -6
index 8d5b6e415b62..dc445c6d93c0 100644
@@ -120,16 +120,14 @@ endif
 
 # We need the host version of macro_predef during the build, before
 # building it we need to prepare the makefile.
-# "The -j (parallel) flag must not be used with make"
-# (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html)
 define EXIM_BUILD_CMDS
-	$(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) makefile
-	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D)/build-br macro_predef \
+	$(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) makefile
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build-br macro_predef \
 		CC=$(HOSTCC) \
 		LNCC=$(HOSTCC) \
 		CFLAGS="-std=c99 $(HOST_CFLAGS)" \
 		LFLAGS="-fPIC $(HOST_LDFLAGS)"
-	$(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \
+	$(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \
 		CFLAGS="-std=c99 $(TARGET_CFLAGS)"
 endef
 
@@ -137,7 +135,7 @@ endef
 # something when installing...
 define EXIM_INSTALL_TARGET_CMDS
 	DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \
-	  $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \
+	  $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \
 		CFLAGS="-std=c99 $(TARGET_CFLAGS)" \
 		install
 	chmod u+s $(TARGET_DIR)/usr/sbin/exim
Signature · 1 line
2.26.1
#1 lore raw

PATCH 1/1 packages/exim: enable parallel make

Am Mon, 20 Apr 2020 18:36:45 +0200 schrieb Luca Ceresoli:

Quoted 3 lines

Parallel make used to be broken in exim, as reported in its docs. Now that line has disappeared from the docs, and parallel make is actually working.

(build-tested with -j9 and this defconfig
BR2_PACKAGE_DOVECOT=y
BR2_PACKAGE_EXIM=y
BR2_PACKAGE_CLAMAV=y)

#2 lore raw

PATCH 1/1 packages/exim: enable parallel make

In reply to Luca Ceresoli

Luca, All,

On 2020-04-20 18:36 +0200, Luca Ceresoli spake thusly:

Quoted 9 lines

Parallel make used to be broken in exim, as reported in its docs. Now that line has disappeared from the docs, and parallel make is actually working.

Tested with 'make exim-dirclean ; time make BR2_JLEVEL=999 exim': builds still succeed and the build time decreases from 34 to 11 seconds on my host.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 44 lines
---
 package/exim/exim.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
package/exim/exim.mk +4 -6
index 8d5b6e415b62..dc445c6d93c0 100644
@@ -120,16 +120,14 @@ endif
 
 # We need the host version of macro_predef during the build, before
 # building it we need to prepare the makefile.
-# "The -j (parallel) flag must not be used with make"
-# (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html)
 define EXIM_BUILD_CMDS
-	$(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) makefile
-	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D)/build-br macro_predef \
+	$(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) makefile
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build-br macro_predef \
 		CC=$(HOSTCC) \
 		LNCC=$(HOSTCC) \
 		CFLAGS="-std=c99 $(HOST_CFLAGS)" \
 		LFLAGS="-fPIC $(HOST_LDFLAGS)"
-	$(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \
+	$(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \
 		CFLAGS="-std=c99 $(TARGET_CFLAGS)"
 endef
 
@@ -137,7 +135,7 @@ endef
 # something when installing...
 define EXIM_INSTALL_TARGET_CMDS
 	DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \
-	  $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) \
+	  $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \
 		CFLAGS="-std=c99 $(TARGET_CFLAGS)" \
 		install
 	chmod u+s $(TARGET_DIR)/usr/sbin/exim
Signature · 6 lines
2.26.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 packages/exim: enable parallel make

In reply to Luca Ceresoli
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Luca" == Luca Ceresoli <[email protected]> writes:

Parallel make used to be broken in exim, as reported in its docs. Now that line has disappeared from the docs, and parallel make is actually working.

Tested with 'make exim-dirclean ; time make BR2_JLEVEL=999 exim': builds still succeed and the build time decreases from 34 to 11 seconds on my host.

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 packages/exim: enable parallel make

Hi Peter,

Quoted 5 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Luca" == Luca Ceresoli <[email protected]> writes:

Parallel make used to be broken in exim, as reported in its docs. Now that line has disappeared from the docs, and parallel make is actually working.

Quoted 8 lines
Quoted 6 lines

Tested with 'make exim-dirclean ; time make BR2_JLEVEL=999 exim': builds still succeed and the build time decreases from 34 to 11 seconds on my host.

Committed to 2020.02.x, thanks.

Does this patch really belong to a stable branch?

If it does, then you should also apply [0] or we'll start seeing parallel build failures on 2020.02.x too.

[0]
https://git.busybox.net/buildroot/commit/?id=8c75f95e0a3d2600015be5564ee9fe9393d95ebc

Signature · 1 line
Luca
#5 lore raw

PATCH 1/1 packages/exim: enable parallel make

Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Luca" == Luca Ceresoli <[email protected]> writes:

Hi Peter,

Quoted 9 lines · Peter Korsgaard
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Luca" == Luca Ceresoli <[email protected]> writes:

Parallel make used to be broken in exim, as reported in its docs. Now that line has disappeared from the docs, and parallel make is actually working.

Tested with 'make exim-dirclean ; time make BR2_JLEVEL=999 exim': builds still succeed and the build time decreases from 34 to 11 seconds on my host.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Committed to 2020.02.x, thanks.

Does this patch really belong to a stable branch?

I agree that it is a gray zone. Given that there weren't any followup fixups on master since then (or so I thought, it turned out my tree was not uptodate) I found it "safe".

Quoted 5 lines

If it does, then you should also apply [0] or we'll start seeing parallel build failures on 2020.02.x too.

[0]
https://git.busybox.net/buildroot/commit/?id=8c75f95e0a3d2600015be5564ee9fe9393d95ebc

I'll do so later today. Yann also pointed that out to me.

Signature · 1 line
Bye, Peter Korsgaard