* [Buildroot] [PATCH v2] package/libnss: fix PowerPc build failure
@ 2020-02-27 11:02 Giulio Benetti
2020-02-27 11:03 ` Giulio Benetti
2020-03-08 15:09 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Giulio Benetti @ 2020-02-27 11:02 UTC (permalink / raw)
To: buildroot
NSS assumes <sys/auvx.h> is always present but that's not true, so add a
patch to check if it exists or not.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
V1->V2:
* improve patch according to upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1614183
---
...heck-if-PPC-__has_include-sys-auxv.h.patch | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
diff --git a/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch b/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
new file mode 100644
index 0000000000..1325387760
--- /dev/null
+++ b/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
@@ -0,0 +1,51 @@
+From d9c7cbb3660d8a2da9ce42e4d1b58642a256a91a Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Sun, 9 Feb 2020 10:15:16 +0100
+Subject: [PATCH] Bug 1614183 - Check if PPC __has_include(<sys/auxv.h>)
+
+Some build environment doesn't provide <sys/auxv.h> and this causes
+build failure, so let's check if that header exists by using
+__has_include() helper.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ nss/lib/freebl/blinit.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
+index 7e8adfc64..d4921aaee 100644
+--- a/nss/lib/freebl/blinit.c
++++ b/nss/lib/freebl/blinit.c
+@@ -431,8 +431,14 @@ ppc_crypto_support()
+
+ #if defined(__powerpc__)
+
++#ifndef __has_include
++#define __has_include(x) 0
++#endif
++
+ #if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD__ >= 12)
++#if __has_include(<sys/auxv.h>)
+ #include <sys/auxv.h>
++#endif
+ #elif (defined(__FreeBSD__) && __FreeBSD__ < 12)
+ #include <sys/sysctl.h>
+ #endif
+@@ -449,10 +455,14 @@ CheckPPCSupport()
+
+ unsigned long hwcaps = 0;
+ #if defined(__linux__)
++#if __has_include(<sys/auxv.h>)
+ hwcaps = getauxval(AT_HWCAP2);
++#endif
+ #elif defined(__FreeBSD__)
+ #if __FreeBSD__ >= 12
++#if __has_include(<sys/auxv.h>)
+ elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps));
++#endif
+ #else
+ size_t len = sizeof(hwcaps);
+ sysctlbyname("hw.cpu_features2", &hwcaps, &len, NULL, 0);
+--
+2.20.1
+
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] package/libnss: fix PowerPc build failure
2020-02-27 11:02 [Buildroot] [PATCH v2] package/libnss: fix PowerPc build failure Giulio Benetti
@ 2020-02-27 11:03 ` Giulio Benetti
2020-03-08 15:09 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Giulio Benetti @ 2020-02-27 11:03 UTC (permalink / raw)
To: buildroot
Sorry, forgot to add to commit log:
Fixes:
http://autobuild.buildroot.net/results/425ba828d30c2bd55ce9f4f00e67bc10d9de2867/
On 2/27/20 12:02 PM, Giulio Benetti wrote:
> NSS assumes <sys/auvx.h> is always present but that's not true, so add a
> patch to check if it exists or not.
>
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
> V1->V2:
> * improve patch according to upstream:
> https://bugzilla.mozilla.org/show_bug.cgi?id=1614183
> ---
> ...heck-if-PPC-__has_include-sys-auxv.h.patch | 51 +++++++++++++++++++
> 1 file changed, 51 insertions(+)
> create mode 100644 package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
>
> diff --git a/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch b/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
> new file mode 100644
> index 0000000000..1325387760
> --- /dev/null
> +++ b/package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
> @@ -0,0 +1,51 @@
> +From d9c7cbb3660d8a2da9ce42e4d1b58642a256a91a Mon Sep 17 00:00:00 2001
> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +Date: Sun, 9 Feb 2020 10:15:16 +0100
> +Subject: [PATCH] Bug 1614183 - Check if PPC __has_include(<sys/auxv.h>)
> +
> +Some build environment doesn't provide <sys/auxv.h> and this causes
> +build failure, so let's check if that header exists by using
> +__has_include() helper.
> +
> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +---
> + nss/lib/freebl/blinit.c | 10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff --git a/nss/lib/freebl/blinit.c b/nss/lib/freebl/blinit.c
> +index 7e8adfc64..d4921aaee 100644
> +--- a/nss/lib/freebl/blinit.c
> ++++ b/nss/lib/freebl/blinit.c
> +@@ -431,8 +431,14 @@ ppc_crypto_support()
> +
> + #if defined(__powerpc__)
> +
> ++#ifndef __has_include
> ++#define __has_include(x) 0
> ++#endif
> ++
> + #if defined(__linux__) || (defined(__FreeBSD__) && __FreeBSD__ >= 12)
> ++#if __has_include(<sys/auxv.h>)
> + #include <sys/auxv.h>
> ++#endif
> + #elif (defined(__FreeBSD__) && __FreeBSD__ < 12)
> + #include <sys/sysctl.h>
> + #endif
> +@@ -449,10 +455,14 @@ CheckPPCSupport()
> +
> + unsigned long hwcaps = 0;
> + #if defined(__linux__)
> ++#if __has_include(<sys/auxv.h>)
> + hwcaps = getauxval(AT_HWCAP2);
> ++#endif
> + #elif defined(__FreeBSD__)
> + #if __FreeBSD__ >= 12
> ++#if __has_include(<sys/auxv.h>)
> + elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps));
> ++#endif
> + #else
> + size_t len = sizeof(hwcaps);
> + sysctlbyname("hw.cpu_features2", &hwcaps, &len, NULL, 0);
> +--
> +2.20.1
> +
>
--
Giulio Benetti
Benetti Engineering sas
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] package/libnss: fix PowerPc build failure
2020-02-27 11:02 [Buildroot] [PATCH v2] package/libnss: fix PowerPc build failure Giulio Benetti
2020-02-27 11:03 ` Giulio Benetti
@ 2020-03-08 15:09 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-03-08 15:09 UTC (permalink / raw)
To: buildroot
On Thu, 27 Feb 2020 12:02:40 +0100
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:
> NSS assumes <sys/auvx.h> is always present but that's not true, so add a
> patch to check if it exists or not.
>
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
> V1->V2:
> * improve patch according to upstream:
> https://bugzilla.mozilla.org/show_bug.cgi?id=1614183
> ---
> ...heck-if-PPC-__has_include-sys-auxv.h.patch | 51 +++++++++++++++++++
> 1 file changed, 51 insertions(+)
> create mode 100644 package/libnss/0001-Bug-1614183-Check-if-PPC-__has_include-sys-auxv.h.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-08 15:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-27 11:02 [Buildroot] [PATCH v2] package/libnss: fix PowerPc build failure Giulio Benetti
2020-02-27 11:03 ` Giulio Benetti
2020-03-08 15:09 ` Thomas Petazzoni
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.