Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From 919fc5d674fae99fe21ba1351d98b75e466f425f Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 22 Feb 2017 11:36:11 +0200 |
| 4 | Subject: [PATCH] nss: fix support cross compiling |
| 5 | |
| 6 | Let some make variables be assigned from outside makefile. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [configuration] |
| 9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
Andrew Geissler | 748a483 | 2020-07-24 16:24:21 -0500 | [diff] [blame] | 11 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | --- |
| 13 | nss/coreconf/arch.mk | 2 +- |
| 14 | nss/lib/freebl/Makefile | 6 ++++++ |
| 15 | 2 files changed, 7 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 18 | index 2012d18..78fca62 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 19 | --- a/nss/coreconf/arch.mk |
| 20 | +++ b/nss/coreconf/arch.mk |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 21 | @@ -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 Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 27 | 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 | # |
| 35 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 36 | index 0b8c6f4..b38889f 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 37 | --- 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 |