aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2023-02-20 17:24:28 +0100
committerArmin Kuster <akuster808@gmail.com>2023-03-05 07:44:20 -0500
commit32adef456603ddab249b1be238e26616b7a0cb25 (patch)
tree4020551c2be217254ac6acf3301ebd6b2ce7ceb1
parent82c75b466e55d7dca7a2364986ecb704cf63d141 (diff)
downloadmeta-openembedded-contrib-32adef456603ddab249b1be238e26616b7a0cb25.tar.gz
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 <dmitry.baryshkov@linaro.org> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch7
1 files changed, 6 insertions, 1 deletions
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