| From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a 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 | 4 ++-- |
| nss/lib/freebl/Makefile | 6 ++++++ |
| 2 files changed, 8 insertions(+), 2 deletions(-) |
| |
| diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk |
| index 17e9fae..bc4180a 100644 |
| --- a/nss/coreconf/arch.mk |
| +++ b/nss/coreconf/arch.mk |
| @@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) |
| # Attempt to differentiate between sparc and x86 Solaris |
| # |
| |
| -OS_TEST := $(shell uname -m) |
| +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 eeee90a..7ee8736 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 |