uclibc: disable parallel build for uClibc 0.9.31

PATCH New Alexey Brodkin 2 participants 4 messages Jun 30, 2014

Share & tools

Alexey Brodkin

author

2014-06-30 14:30 UTC #0 lore raw

PATCH 1/1 uclibc: disable parallel build for uClibc 0.9.31

This is only required for uClibc 0.9.31 and this veriosn is only used by AVR32 so could be safely removed together with AVR32.

Even 0.9.32 builds well in parallel (at least on x86) so IMHO there's no need in >= 0.9.33, just disable for a particular broken version.

Signed-off-by Alexey Brodkin <[email protected]>

Cc Anton Kolesov <[email protected]>

Cc Peter Korsgaard <[email protected]>

Cc Gustavo Zacarias <[email protected]>

Cc Thomas Petazzoni <[email protected]>

Cc Thomas De Schampheleire <[email protected]>

---
 package/uclibc/uclibc.mk | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

package/uclibc/uclibc.mk +13 -1

index 28a8a08..af3a4d4 100644
@@ -493,8 +493,20 @@ define UCLIBC_BUILD_TEST_SUITE
 endef
 endif
 
+# In uClibc 0.9.31 parallel building is broken so we have to disable it
+# Fortunately uClibc 0.9.31 is only used by AVR32 and in its turn AVR32 is
+# about to be removed from buildroot.
+#
+# So as soon as AVR32 is removed please revert this patch so instead of
+# MAKE_UCLIBC normal "MAKE" is used in UCLIBC_BUILD_CMDS
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31),y)
+	MAKE_UCLIBC = $(MAKE1)
+else
+	MAKE_UCLIBC = $(MAKE)
+endif
+
 define UCLIBC_BUILD_CMDS
-	$(MAKE) -C $(@D) \
+	$(MAKE_UCLIBC) -C $(@D) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX= \
 		DEVEL_PREFIX=/ \

Signature · 1 line

1.9.3

Thomas Petazzoni

2014-06-30 14:42 UTC #1 lore raw

PATCH 1/1 uclibc: disable parallel build for uClibc 0.9.31

Dear Alexey Brodkin,

package/uclibc/uclibc.mk define UCLIBC_BUILD_TEST_SUITE · line 506

Quoted 11 lines · Alexey Brodkin

package/uclibc/uclibc.mk +11 -0

+# In uClibc 0.9.31 parallel building is broken so we have to disable it
+# Fortunately uClibc 0.9.31 is only used by AVR32 and in its turn AVR32 is
+# about to be removed from buildroot.
+#
+# So as soon as AVR32 is removed please revert this patch so instead of
+# MAKE_UCLIBC normal "MAKE" is used in UCLIBC_BUILD_CMDS
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31),y)
+	MAKE_UCLIBC = $(MAKE1)
+else
+	MAKE_UCLIBC = $(MAKE)
+endif

Sorry to nitpick, but I'd prefer to use UCLIBC_MAKE as the variable name. We use <PKG>_<SOMETHING> for all variables, so it would make more sense to do the same.

package/uclibc/uclibc.mk define UCLIBC_BUILD_TEST_SUITE · line 509

Quoted 3 lines

define UCLIBC_BUILD_CMDS
package/uclibc/uclibc.mk +1 -1
-	$(MAKE) -C $(@D) \
+	$(MAKE_UCLIBC) -C $(@D) \

Your original patch changing MAKE1 -> MAKE changed two places, and you're changing only one place here. To be sure, we should probably change back both places, no?

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Alexey Brodkin

author

2014-06-30 16:01 UTC #2 lore raw

PATCH 1/1 uclibc: disable parallel build for uClibc 0.9.31

Hi Thomas,

Quoted 3 lines · Thomas Petazzoni

Sorry to nitpick, but I'd prefer to use UCLIBC_MAKE as the variable name. We use <PKG>_<SOMETHING> for all variables, so it would make more sense to do the same.

Ok I didn't think about this concept - just used whatever first appeared in my mind. So will use UCLIBC_MAKE - makes sense.

Quoted 7 lines

package/uclibc/uclibc.mk define UCLIBC_BUILD_TEST_SUITE · line 509
Quoted 3 lines
define UCLIBC_BUILD_CMDS
package/uclibc/uclibc.mk +1 -1
-	$(MAKE) -C $(@D) \
+	$(MAKE_UCLIBC) -C $(@D) \
Your original patch changing MAKE1 -> MAKE changed two places, and you're changing only one place here. To be sure, we should probably change back both places, no?

I do see that host utilities were built perfectly fine in parallel mode then why do more changes than needed?

-Alexey

Thomas Petazzoni

2014-06-30 16:10 UTC #3 lore raw

PATCH 1/1 uclibc: disable parallel build for uClibc 0.9.31

Dear Alexey Brodkin,

Quoted 16 lines · Alexey Brodkin

Quoted 3 lines · Thomas Petazzoni
Sorry to nitpick, but I'd prefer to use UCLIBC_MAKE as the variable name. We use <PKG>_<SOMETHING> for all variables, so it would make more sense to do the same.
Ok I didn't think about this concept - just used whatever first appeared in my mind. So will use UCLIBC_MAKE - makes sense.
Quoted 7 lines
package/uclibc/uclibc.mk define UCLIBC_BUILD_TEST_SUITE · line 509
Quoted 3 lines
define UCLIBC_BUILD_CMDS
package/uclibc/uclibc.mk +1 -1
-	$(MAKE) -C $(@D) \
+	$(MAKE_UCLIBC) -C $(@D) \
Your original patch changing MAKE1 -> MAKE changed two places, and you're changing only one place here. To be sure, we should probably change back both places, no?

Quoted 2 lines

I do see that host utilities were built perfectly fine in parallel mode then why do more changes than needed?

Ok, fine with me.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com