Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 6b3819159949ed7fc099e588e2e0669407135121 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Tue, 10 Sep 2019 11:29:02 +0200
|
||||
Subject: [PATCH] Bug 1580126 - Fix build failure on aarch64_be while building
|
||||
freebl/gcm
|
||||
|
||||
Build failure is caused by different #ifdef conditions in gcm.c and
|
||||
gcm-aarch64.c that leads to double declaration of the same gcm_*
|
||||
functions.
|
||||
|
||||
Fix #ifdef condition in gcm-aarch64.c making it the same as the one in
|
||||
gcm.c.
|
||||
|
||||
[Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1580126]
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
nss/lib/freebl/gcm-aarch64.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nss/lib/freebl/gcm-aarch64.c b/nss/lib/freebl/gcm-aarch64.c
|
||||
index 65ea9fb5f..3f3c046d7 100644
|
||||
--- a/nss/lib/freebl/gcm-aarch64.c
|
||||
+++ b/nss/lib/freebl/gcm-aarch64.c
|
||||
@@ -9,7 +9,8 @@
|
||||
#include "secerr.h"
|
||||
|
||||
/* old gcc doesn't support some poly64x2_t intrinsic */
|
||||
-#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ > 6)
|
||||
+#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
|
||||
+ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
|
||||
|
||||
#include <arm_neon.h>
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_39_RTM/src/SHA256SUMS
|
||||
sha256 6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b nss-3.39.tar.gz
|
||||
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_42_1_RTM/src/SHA256SUMS
|
||||
sha256 6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef nss-3.46.tar.gz
|
||||
# Locally calculated
|
||||
sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNSS_VERSION = 3.39
|
||||
LIBNSS_VERSION = 3.46
|
||||
LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
|
||||
LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
|
||||
LIBNSS_DISTDIR = dist
|
||||
@@ -13,6 +13,14 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib
|
||||
LIBNSS_LICENSE = MPL-2.0
|
||||
LIBNSS_LICENSE_FILES = nss/COPYING
|
||||
|
||||
# Need to pass down TARGET_CFLAGS and TARGET_LDFLAGS
|
||||
define LIBNSS_FIXUP_LINUX_MK
|
||||
echo 'OS_CFLAGS += $(TARGET_CFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
|
||||
echo 'LDFLAGS += $(TARGET_LDFLAGS)' >> $(@D)/nss/coreconf/Linux.mk
|
||||
endef
|
||||
|
||||
LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_FIXUP_LINUX_MK
|
||||
|
||||
# --gc-sections triggers binutils ld segfault
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=21180
|
||||
ifeq ($(BR2_microblaze),y)
|
||||
@@ -33,7 +41,6 @@ LIBNSS_BUILD_VARS = \
|
||||
MOZILLA_CLIENT=1 \
|
||||
NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
|
||||
NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \
|
||||
BUILD_OPT=1 \
|
||||
NS_USE_GCC=1 \
|
||||
NSS_DISABLE_GTESTS=1 \
|
||||
NSS_USE_SYSTEM_SQLITE=1 \
|
||||
@@ -41,7 +48,8 @@ LIBNSS_BUILD_VARS = \
|
||||
NATIVE_CC="$(HOSTCC)" \
|
||||
OS_ARCH="Linux" \
|
||||
OS_RELEASE="2.6" \
|
||||
OS_TEST="$(LIBNSS_ARCH)"
|
||||
OS_TEST="$(LIBNSS_ARCH)" \
|
||||
NSS_ENABLE_WERROR=0
|
||||
|
||||
# #pragma usage needs gcc >= 4.8
|
||||
# See https://bugzilla.mozilla.org/show_bug.cgi?id=1226179
|
||||
@@ -102,13 +110,13 @@ HOST_LIBNSS_BUILD_VARS = \
|
||||
MOZILLA_CLIENT=1 \
|
||||
NSPR_INCLUDE_DIR=$(HOST_DIR)/include/nspr \
|
||||
NSPR_LIB_DIR=$(HOST_DIR)/lib \
|
||||
BUILD_OPT=1 \
|
||||
NS_USE_GCC=1 \
|
||||
NSS_DISABLE_GTESTS=1 \
|
||||
NSS_USE_SYSTEM_SQLITE=1 \
|
||||
SQLITE_INCLUDE_DIR=$(HOST_DIR)/include \
|
||||
ZLIB_INCLUDE_DIR=$(HOST_DIR)/include \
|
||||
NSS_ENABLE_ECC=1
|
||||
NSS_ENABLE_ECC=1 \
|
||||
NSS_ENABLE_WERROR=0
|
||||
|
||||
HOST_LIBNSS_DEPENDENCIES = host-libnspr host-sqlite host-zlib
|
||||
|
||||
|
||||
Reference in New Issue
Block a user