| Message ID | 1400753901-49457-1-git-send-email-Vincent.Riera@imgtec.com |
|---|---|
| State | Superseded |
| Headers | show |
Dear Vicente Olivert Riera, On Thu, 22 May 2014 11:18:21 +0100, Vicente Olivert Riera wrote: > ifeq ($(BR2_ARCH_IS_64),y) > +ifeq ($(BR2_MIPS_NABI32),) > LIBNSS_BUILD_VARS += USE_64=1 > endif > +endif I'm sorry to be annoying here, but do you think we could add a comment above this to explain why BR2_MIPS_NABI32 is handled specially here? Thanks! Thomas
On 05/22/2014 01:06 PM, Thomas Petazzoni wrote: > Dear Vicente Olivert Riera, > > On Thu, 22 May 2014 11:18:21 +0100, Vicente Olivert Riera wrote: > >> ifeq ($(BR2_ARCH_IS_64),y) >> +ifeq ($(BR2_MIPS_NABI32),) >> LIBNSS_BUILD_VARS += USE_64=1 >> endif >> +endif > > I'm sorry to be annoying here, but do you think we could add a comment > above this to explain why BR2_MIPS_NABI32 is handled specially here? You don't need to say sorry, Thomas. It's a good idea, I will add a comment. > Thanks! Thanks to you. > Thomas >
diff --git a/package/libnss/Config.in b/package/libnss/Config.in index 9a1668c..690f928 100644 --- a/package/libnss/Config.in +++ b/package/libnss/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_LIBNSS depends on BR2_LARGEFILE depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr - depends on !BR2_MIPS_NABI32 help Network Security Services (NSS) is a set of libraries designed to support development of security-enabled client and server @@ -19,4 +18,3 @@ config BR2_PACKAGE_LIBNSS comment "libnss needs a toolchain w/ largefile, threads" depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_MIPS_NABI32 diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 666df74..058f9de 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -30,8 +30,10 @@ LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \ OS_TEST="$(ARCH)" ifeq ($(BR2_ARCH_IS_64),y) +ifeq ($(BR2_MIPS_NABI32),) LIBNSS_BUILD_VARS += USE_64=1 endif +endif define LIBNSS_BUILD_CMDS
After talking with upstream we concluded that MIPS64 n32 is treated as a 32-bit architecture by libnss because it has 32-bit pointers, so USE_64=1 should not be set in that case. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1010730 WRT: http://git.buildroot.net/buildroot/commit/?id=73e6ae0fe6a69f88183ae33401f2314088b5f799 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- package/libnss/Config.in | 2 -- package/libnss/libnss.mk | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)