Patchwork libnss: fix build failures

login
register
mail settings
Submitter Gustavo Zacarias
Date Dec. 11, 2012, 1:31 p.m.
Message ID <1355232660-2377-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/205215/
State Accepted
Commit 8b827859f994767052f31d4ee6ca6524b5065d01
Headers show

Comments

Gustavo Zacarias - Dec. 11, 2012, 1:31 p.m.
Such as
http://autobuild.buildroot.net/results/2ca1d135269a67201e6b4d995ce8fbe94db1ed3f

The mozilla build system passes all of the different ways of CFLAGS
(OPTIMIZER, XCFLAGS, OS_CFLAGS) even when building host tools
(nsintall).
The best way around this without patching libnss is just building the
host tools first without any CFLAGS and then going on with the rest.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libnss/libnss.mk |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
Peter Korsgaard - Dec. 16, 2012, 9:02 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Such as
 Gustavo> http://autobuild.buildroot.net/results/2ca1d135269a67201e6b4d995ce8fbe94db1ed3f

 Gustavo> The mozilla build system passes all of the different ways of CFLAGS
 Gustavo> (OPTIMIZER, XCFLAGS, OS_CFLAGS) even when building host tools
 Gustavo> (nsintall).
 Gustavo> The best way around this without patching libnss is just building the
 Gustavo> host tools first without any CFLAGS and then going on with the rest.

Committed, thanks.
Peter Korsgaard - Dec. 16, 2012, 10:10 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Such as
 Gustavo> http://autobuild.buildroot.net/results/2ca1d135269a67201e6b4d995ce8fbe94db1ed3f

 Gustavo> The mozilla build system passes all of the different ways of CFLAGS
 Gustavo> (OPTIMIZER, XCFLAGS, OS_CFLAGS) even when building host tools
 Gustavo> (nsintall).
 Gustavo> The best way around this without patching libnss is just building the
 Gustavo> host tools first without any CFLAGS and then going on with the rest.

Hmm, with this applied we still have autobuild failures:

http://autobuild.buildroot.net/results/299a132e7921aef044d121f910175cb9ddc7a04a/build-end.log

Patch

diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 84fc149..96faf37 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -17,7 +17,6 @@  LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
 		NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
 		BUILD_OPT=1 \
 		NS_USE_GCC=1 \
-		OPTIMIZER="$(TARGET_CFLAGS)" \
 		NSS_USE_SYSTEM_SQLITE=1 \
 		NSS_ENABLE_ECC=1 \
 		NATIVE_CC="$(HOSTCC)" \
@@ -34,11 +33,16 @@  endif
 
 
 define LIBNSS_BUILD_CMDS
-	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_coreconf build_dbm all \
+	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_coreconf \
 			SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
 			DIST=$(@D)/$(LIBNSS_DISTDIR) \
 			CHECKLOC= \
 			$(LIBNSS_BUILD_VARS)
+	$(MAKE1) -C $(@D)/$(LIBNSS_SUBDIR)/nss build_dbm all \
+			SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
+			DIST=$(@D)/$(LIBNSS_DISTDIR) \
+			CHECKLOC= \
+			$(LIBNSS_BUILD_VARS) OPTIMIZER="$(TARGET_CFLAGS)"
 endef
 
 define LIBNSS_INSTALL_STAGING_CMDS