| Message ID | 20220101210952.2148256-1-giulio.benetti@benettiengineering.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/libnss: fix build failure with make version 4.3 | expand |
Giulio, All, On 2022-01-01 22:09 +0100, Giulio Benetti spake thusly: > Make 4.3 is buggy and when parallel building host-libnss/libnss we end up > with a failure thrown by make itself. So let's work-around this by don't > parallel build the package if Make version is 4.3. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libnss/libnss.mk | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk > index e2f7521b47..b6279fa921 100644 > --- a/package/libnss/libnss.mk > +++ b/package/libnss/libnss.mk > @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING > LIBNSS_CPE_ID_VENDOR = mozilla > LIBNSS_CPE_ID_PRODUCT = nss > > +# Don't parallel build if make version = 4.3 > +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) > +LIBNSS_MAKE = $(MAKE1) > +else > +LIBNSS_MAKE = $(MAKE) > +endif > + > LIBNSS_CFLAGS = $(TARGET_CFLAGS) > > ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) > @@ -71,12 +78,12 @@ endif > endif > > define LIBNSS_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ > + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > $(LIBNSS_BUILD_VARS) > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ > + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 > endif > > define HOST_LIBNSS_BUILD_CMDS > - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ > + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > $(HOST_LIBNSS_BUILD_VARS) > - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ > + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ > SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ > DIST=$(@D)/$(LIBNSS_DISTDIR) \ > CHECKLOC= \ > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Giulio" == Giulio Benetti <giulio.benetti@benettiengineering.com> writes: > Make 4.3 is buggy and when parallel building host-libnss/libnss we end up > with a failure thrown by make itself. So let's work-around this by don't > parallel build the package if Make version is 4.3. > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Committed to 2021.11.x, thanks.
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2f7521b47..b6279fa921 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -15,6 +15,13 @@ LIBNSS_LICENSE_FILES = nss/COPYING LIBNSS_CPE_ID_VENDOR = mozilla LIBNSS_CPE_ID_PRODUCT = nss +# Don't parallel build if make version = 4.3 +ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) +LIBNSS_MAKE = $(MAKE1) +else +LIBNSS_MAKE = $(MAKE) +endif + LIBNSS_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85862),y) @@ -71,12 +78,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ @@ -131,12 +138,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1 endif define HOST_LIBNSS_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(HOST_LIBNSS_BUILD_VARS) - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \ + $(HOST_CONFIGURE_OPTS) $(LIBNSS_MAKE) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \
Make 4.3 is buggy and when parallel building host-libnss/libnss we end up with a failure thrown by make itself. So let's work-around this by don't parallel build the package if Make version is 4.3. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- package/libnss/libnss.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)