blob: 950fae667a8c2816944234fef509ebb01f188f98 [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From 919fc5d674fae99fe21ba1351d98b75e466f425f Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 22 Feb 2017 11:36:11 +0200
4Subject: [PATCH] nss: fix support cross compiling
5
6Let some make variables be assigned from outside makefile.
7
8Upstream-Status: Inappropriate [configuration]
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Andrew Geissler748a4832020-07-24 16:24:21 -050011
Brad Bishop6e60e8b2018-02-01 10:27:11 -050012---
13 nss/coreconf/arch.mk | 2 +-
14 nss/lib/freebl/Makefile | 6 ++++++
15 2 files changed, 7 insertions(+), 1 deletion(-)
16
17diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
Andrew Geissler595f6302022-01-24 19:11:47 +000018index 2012d18..78fca62 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050019--- a/nss/coreconf/arch.mk
20+++ b/nss/coreconf/arch.mk
Andrew Geissler517393d2023-01-13 08:55:19 -060021@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)
22 # Attempt to differentiate between sparc and x86 Solaris
23 #
24
25-OS_TEST := $(shell uname -m)
26+OS_TEST ?= $(shell uname -m)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050027 ifeq ($(OS_TEST),i86pc)
28 OS_RELEASE := $(shell uname -r)_$(OS_TEST)
29 else
30- OS_RELEASE := $(shell uname -r)
31+ OS_RELEASE ?= $(shell uname -r)
32 endif
33
34 #
35diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
Andrew Geissler595f6302022-01-24 19:11:47 +000036index 0b8c6f4..b38889f 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050037--- a/nss/lib/freebl/Makefile
38+++ b/nss/lib/freebl/Makefile
39@@ -36,6 +36,12 @@ ifdef USE_64
40 DEFINES += -DNSS_USE_64
41 endif
42
43+ifeq ($(OS_TEST),mips)
44+ifndef USE_64
45+ DEFINES += -DNS_PTR_LE_32
46+endif
47+endif
48+
49 ifdef USE_ABI32_FPU
50 DEFINES += -DNSS_USE_ABI32_FPU
51 endif