mirror of
https://git.yoctoproject.org/poky
synced 2026-07-04 14:13:38 +02:00
e448ef6698
Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. [YOCTO #4096] (From OE-Core rev: 22c146fd3e829b89c07a2019005e180e93fece5d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
72 lines
1.5 KiB
Diff
72 lines
1.5 KiB
Diff
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
|
|
|