NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libsvgtiny: fix parallel build

Browse Source 
Fix previous commit[1] which purpose was to fix parallel build. It
didn't work since it assigned $(MAKE1) to LIBSVGTINY_MAKE, but this is a
generic-package and building is done using $(MAKE), then LIBSVGTINY_MAKE
was ignored. Let's substitute instead $(MAKE) with $(MAKE1) in
LIBSVGTINY_BUILD_CMDS.

[1]:
https://git.buildroot.net/buildroot/commit/?id=26d67a2599d6c88facd5178de853fa355244e7c2

Fixes:
http://autobuild.buildroot.net/results/67d/67d341c0cc272323d6e231a20796a6848c21d760/

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
[yann.morin.1998@free.fr:
  - use $(MAKE1) in all three step
  - move comment out of the define
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Giulio Benetti 2020-02-22 22:44:39 +01:00 committed by Yann E. MORIN
parent ea8dd081aa
commit f36c045e7b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/libsvgtiny/libsvgtiny.mk
View File

@ -12,8 +12,6 @@ LIBSVGTINY_DEPENDENCIES = \
libxml2 host-gperf host-pkgconf host-netsurf-buildsystem libxml2 host-gperf host-pkgconf host-netsurf-buildsystem
LIBSVGTINY_LICENSE = MIT LIBSVGTINY_LICENSE = MIT
LIBSVGTINY_LICENSE_FILES = README LIBSVGTINY_LICENSE_FILES = README
# Package does not build in parallel due to improper make rules
LIBSVGTINY_MAKE = $(MAKE1)
# The libsvgtiny build system cannot build both the shared and static # The libsvgtiny build system cannot build both the shared and static
# libraries. So when the Buildroot configuration requests to build # libraries. So when the Buildroot configuration requests to build
@ -28,20 +26,21 @@ define LIBSVGTINY_CONFIGURE_CMDS
ln -sf $(HOST_DIR)/share/netsurf-buildsystem $(@D)/build ln -sf $(HOST_DIR)/share/netsurf-buildsystem $(@D)/build
endef endef
# Use $(MAKE1) since parallel build fails
define LIBSVGTINY_BUILD_CMDS define LIBSVGTINY_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr \ $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) PREFIX=/usr \
COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE)
endef endef
define LIBSVGTINY_INSTALL_STAGING_CMDS define LIBSVGTINY_INSTALL_STAGING_CMDS
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ $(MAKE1) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \
COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install
endef endef
define LIBSVGTINY_INSTALL_TARGET_CMDS define LIBSVGTINY_INSTALL_TARGET_CMDS
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ $(MAKE1) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \
COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install
endef endef