NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libnss: fix build failure with make 4.3.91

Browse Source 
Make 4.3.91 doesn't allow to safely override Simple Expanded Variables, so
let's add a patch pending upstream[0] to make those variable Conditional
Expanded.

[0]: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182

Fixes:
http://autobuild.buildroot.net/results/1074143dbea60567cd83be0a23f7c0214d470de9/

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Tested-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Giulio Benetti 2022-11-17 20:45:05 +01:00 committed by Thomas Petazzoni
parent b7368099ae
commit 5852fee868
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch Normal file
View File

@ -0,0 +1,45 @@
From a1a5f3afea2ee59bdbb7a74eb2d7f82b635dbd1a Mon Sep 17 00:00:00 2001
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
Date: Thu, 17 Nov 2022 20:38:48 +0100
Subject: [PATCH] Bug 1801182 - Allow overriding OS_ARCH, OS_TEST and
OS_RELEASE in Makefile
Starting from Make 4.3.91 simple expanded variables can't be safely
overriden via command line anymore, so let's use conditional expanded
variables to override OS_ARCH, OS_TEST and OS_RELEASE.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
[Upstream status: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182]
---
nss/coreconf/arch.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
index 17e9faeac..85aac9341 100644
--- a/nss/coreconf/arch.mk
+++ b/nss/coreconf/arch.mk
@@ -20,17 +20,17 @@
# Macros for getting the OS architecture
#
-OS_ARCH := $(subst /,_,$(shell uname -s))
+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)
+ OS_RELEASE ?= $(shell uname -r)_$(OS_TEST)
else
- OS_RELEASE := $(shell uname -r)
+ OS_RELEASE ?= $(shell uname -r)
endif
--
2.34.1