From da1ff7a5ae6bbabdb74a01a043a7f5e8563c1ff1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 24 Nov 2022 15:51:56 +0300 Subject: [PATCH] nss: fix cross-compilation error Change OS_TEST to be soft assignment so that the cross-compilation doens't fail with the errors like (note the difference in CPU tags): | make[4]: *** No rule to make target '../certhigh/Linux3.4_x86_64_glibc_PTH_64_OPT.OBJ/certhtml.o', needed by 'Linux3.4_aarch64_glibc_PTH_64_OPT.OBJ/libnss3.so'. Stop. Signed-off-by: Dmitry Baryshkov Signed-off-by: Khem Raj --- .../nss/nss/0001-nss-fix-support-cross-compiling.patch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index eb6174a7b0..950fae667a 100644 --- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -18,7 +18,12 @@ diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk index 2012d18..78fca62 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) +@@ -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