sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

nss: update to 3.28.1 

Rebase nss-fix-support-cross-compiling.patch

(From OE-Core rev: f65baebafc3d1389c5e5000c6cd921b7569123a1)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2017-02-22 16:51:18 +02:00 committed by Richard Purdie
parent 1f17010446
commit 9e6cb6ec8b
3 changed files with 52 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch Normal file
View File

@ -0,0 +1,48 @@
From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 22 Feb 2017 11:36:11 +0200
Subject: [PATCH] nss: fix support cross compiling
Let some make variables be assigned from outside makefile.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
nss/coreconf/arch.mk | 2 +-
nss/lib/freebl/Makefile | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
index 06c276f..9c1eb51 100644
--- a/nss/coreconf/arch.mk
+++ b/nss/coreconf/arch.mk
@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m)
ifeq ($(OS_TEST),i86pc)
OS_RELEASE := $(shell uname -r)_$(OS_TEST)
else
- OS_RELEASE := $(shell uname -r)
+ OS_RELEASE ?= $(shell uname -r)
endif
#
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 0ce1425..ebeb411 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -36,6 +36,12 @@ ifdef USE_64
DEFINES += -DNSS_USE_64
endif
+ifeq ($(OS_TEST),mips)
+ifndef USE_64
+ DEFINES += -DNS_PTR_LE_32
+endif
+endif
+
ifdef USE_ABI32_FPU
DEFINES += -DNSS_USE_ABI32_FPU
endif
--
2.11.0

71
meta/recipes-support/nss/nss/nss-fix-support-cross-compiling.patch
View File

@ -1,71 +0,0 @@
nss: fix support cross compiling
Let some make variables be assigned from outside makefile.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Inappropriate [configuration]
---
nss/coreconf/Linux.mk | 12 +++++++++++-
nss/coreconf/arch.mk | 2 +-
nss/lib/freebl/Makefile | 6 ++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
--- a/nss/coreconf/Linux.mk
+++ b/nss/coreconf/Linux.mk
@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
endif
+ifndef CC
CC = gcc
+endif
+
+ifdef CXX
+CCC = $(CXX)
+else
CCC = g++
+endif
+
+ifndef RANLIB
RANLIB = ranlib
+endif
-DEFAULT_COMPILER = gcc
+DEFAULT_COMPILER = $(CC)
ifeq ($(OS_TARGET),Android)
ifndef ANDROID_NDK
diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
index 6557348..b722412 100644
--- a/nss/coreconf/arch.mk
+++ b/nss/coreconf/arch.mk
@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m)
ifeq ($(OS_TEST),i86pc)
OS_RELEASE := $(shell uname -r)_$(OS_TEST)
else
- OS_RELEASE := $(shell uname -r)
+ OS_RELEASE ?= $(shell uname -r)
endif
#
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 0d293f1..678f506 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -36,6 +36,12 @@ ifdef USE_64
DEFINES += -DNSS_USE_64
endif
+ifeq ($(OS_TEST),mips)
+ifndef USE_64
+ DEFINES += -DNS_PTR_LE_32
+endif
+endif
+
ifdef USE_ABI32_FPU
DEFINES += -DNSS_USE_ABI32_FPU
endif
--
1.8.1.2

8
meta/recipes-support/nss/nss_3.27.1.bb → meta/recipes-support/nss/nss_3.28.1.bb
View File

@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
SRC_URI = "\
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_27_1_RTM/src/${BP}.tar.gz \
file://nss-fix-support-cross-compiling.patch \
http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_28_1_RTM/src/${BP}.tar.gz \
file://0001-nss-fix-support-cross-compiling.patch \
file://nss-no-rpath-for-cross-compiling.patch \
file://nss-fix-incorrect-shebang-of-perl.patch \
file://nss-fix-nsinstall-build.patch \
@ -26,8 +26,8 @@ SRC_URI = "\
file://nss.pc.in \
file://signlibs.sh \
"
SRC_URI[md5sum] = "f18e1ebfe07969c84b890e45843edcb7"
SRC_URI[sha256sum] = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"
SRC_URI[md5sum] = "e98d48435cee5792f97ef7fc35a602c3"
SRC_URI[sha256sum] = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"