* [Buildroot] [PATCH] package/libnss: fix build failure with make 4.3.91
@ 2022-11-17 19:45 Giulio Benetti
2022-11-20 18:38 ` James Hilliard
2022-11-21 21:05 ` Thomas Petazzoni via buildroot
0 siblings, 2 replies; 3+ messages in thread
From: Giulio Benetti @ 2022-11-17 19:45 UTC (permalink / raw)
To: buildroot; +Cc: Joseph Kogut, Giulio Benetti, Thomas Petazzoni
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>
---
...w-overriding-OS_ARCH-OS_TEST-and-OS_.patch | 45 +++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
diff --git a/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
new file mode 100644
index 0000000000..7b3abea307
--- /dev/null
+++ b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
@@ -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
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/libnss: fix build failure with make 4.3.91
2022-11-17 19:45 [Buildroot] [PATCH] package/libnss: fix build failure with make 4.3.91 Giulio Benetti
@ 2022-11-20 18:38 ` James Hilliard
2022-11-21 21:05 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: James Hilliard @ 2022-11-20 18:38 UTC (permalink / raw)
To: Giulio Benetti; +Cc: Joseph Kogut, Thomas Petazzoni, buildroot
On Thu, Nov 17, 2022 at 3:45 PM Giulio Benetti
<giulio.benetti@benettiengineering.com> wrote:
>
> 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>
> ---
> ...w-overriding-OS_ARCH-OS_TEST-and-OS_.patch | 45 +++++++++++++++++++
> 1 file changed, 45 insertions(+)
> create mode 100644 package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
>
> diff --git a/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
> new file mode 100644
> index 0000000000..7b3abea307
> --- /dev/null
> +++ b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
> @@ -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
> +
> --
> 2.34.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/libnss: fix build failure with make 4.3.91
2022-11-17 19:45 [Buildroot] [PATCH] package/libnss: fix build failure with make 4.3.91 Giulio Benetti
2022-11-20 18:38 ` James Hilliard
@ 2022-11-21 21:05 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-11-21 21:05 UTC (permalink / raw)
To: Giulio Benetti; +Cc: Joseph Kogut, buildroot
On Thu, 17 Nov 2022 20:45:05 +0100
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:
> 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>
> ---
> ...w-overriding-OS_ARCH-OS_TEST-and-OS_.patch | 45 +++++++++++++++++++
> 1 file changed, 45 insertions(+)
> create mode 100644 package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-21 21:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-17 19:45 [Buildroot] [PATCH] package/libnss: fix build failure with make 4.3.91 Giulio Benetti
2022-11-20 18:38 ` James Hilliard
2022-11-21 21:05 ` Thomas Petazzoni via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.