Skip to content

Commit

Permalink
package/usb_modeswitch: fix parallel install
Browse files Browse the repository at this point in the history
Extract from bug report:

"In usb_modeswitch Makefile dispatcher-script, dispatcher-dynlink and
dispatcher-statlink are .PHONY targets. The result is that sources are
compiled also when install targets are called.
USB_MODESWITCH_INSTALL_TARGET_CMDS calls $(MAKE) which is a call to
parallel make eg. make -j9. So the install phase can install empty
usb_modeswitch binary (happened once) if the compiler have just cleared
the binary and install command installs it before compiler writes the
binary. USB_MODESWITCH_INSTALL_TARGET_CMDS should call $(MAKE1)."

Instead of disabling parellel install, use install-common target instead
of install-{dyn,stat}link targets. Indeed, the dynamic or static
usb_modeswitch_dispatcher binary will be built by
all-with-{dyn,stat}link-dispatcher targets, there is no need to rebuild
it during the install step

Fixes:
 - https://bugs.buildroot.org/show_bug.cgi?id=12911

Signed-off-by: Fabrice Fontaine <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
  • Loading branch information
ffontaine authored and tpetazzoni committed Sep 4, 2020
1 parent f6d1efd commit 345c68f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions package/usb_modeswitch/usb_modeswitch.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ USB_MODESWITCH_BUILD_TARGETS = all
USB_MODESWITCH_INSTALL_TARGETS = install-script
else
USB_MODESWITCH_DEPENDENCIES += jimtcl
USB_MODESWITCH_INSTALL_TARGETS = install-common
ifeq ($(BR2_STATIC_LIBS),y)
USB_MODESWITCH_BUILD_TARGETS = all-with-statlink-dispatcher
USB_MODESWITCH_INSTALL_TARGETS = install-statlink
else
USB_MODESWITCH_BUILD_TARGETS = all-with-dynlink-dispatcher
USB_MODESWITCH_INSTALL_TARGETS = install-dynlink
endif
endif

Expand Down

0 comments on commit 345c68f

Please sign in to comment.