* [Buildroot] [PATCH 0/2] package/libnss: fix build and remove a patch
@ 2019-12-12 14:01 Giulio Benetti
2019-12-12 14:01 ` [Buildroot] [PATCH 1/2] package/libnss: fix build failure on RHEL 7 Giulio Benetti
2019-12-12 14:01 ` [Buildroot] [PATCH 2/2] package/libnss: remove patch Giulio Benetti
0 siblings, 2 replies; 5+ messages in thread
From: Giulio Benetti @ 2019-12-12 14:01 UTC (permalink / raw)
To: buildroot
This patchset must be applied after patch:
https://patchwork.ozlabs.org/patch/1207065/
Giulio Benetti (2):
package/libnss: fix build failure on RHEL 7
package/libnss: remove patch
... 0001-add-zlib-include-dir-variable.patch} | 0
package/libnss/0001-fix-uclibc-build.patch | 22 --------------
...uild-failure-due-to-missing-posix-s.patch} | 0
...ix-PowerPc-build-sys-auxv.h-failure.patch} | 0
...-nsinstall.c-build-failure-on-RHEL-7.patch | 29 +++++++++++++++++++
5 files changed, 29 insertions(+), 22 deletions(-)
rename package/libnss/{0002-add-zlib-include-dir-variable.patch => 0001-add-zlib-include-dir-variable.patch} (100%)
delete mode 100644 package/libnss/0001-fix-uclibc-build.patch
rename package/libnss/{0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch => 0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch} (100%)
rename package/libnss/{0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch => 0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch} (100%)
create mode 100644 package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 1/2] package/libnss: fix build failure on RHEL 7
2019-12-12 14:01 [Buildroot] [PATCH 0/2] package/libnss: fix build and remove a patch Giulio Benetti
@ 2019-12-12 14:01 ` Giulio Benetti
2019-12-23 22:46 ` Thomas Petazzoni
2019-12-12 14:01 ` [Buildroot] [PATCH 2/2] package/libnss: remove patch Giulio Benetti
1 sibling, 1 reply; 5+ messages in thread
From: Giulio Benetti @ 2019-12-12 14:01 UTC (permalink / raw)
To: buildroot
-DLINUX flag was passed to OS_CFLAGS instead of DEFINES, but OS_CFLAGS
is only used when cross-compiling, not when native building.
Add patch to fix build failure on RHEL 7 host by substituting OS_CFLAGS
with DEFINES.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
Patch is pending upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1603398
---
...-nsinstall.c-build-failure-on-RHEL-7.patch | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
diff --git a/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
new file mode 100644
index 0000000000..631d97d11f
--- /dev/null
+++ b/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
@@ -0,0 +1,29 @@
+From 1ba8516045bc8a13fd72e1a85206a04b29d96758 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Thu, 12 Dec 2019 12:57:29 +0100
+Subject: [PATCH] Bug 1603398 - Fix nsinstall.c build failure on RHEL 7
+
+In Linux.mk -DLINUX and -Dlinux must be passed to DEFINES, not
+OS_CFLAGS.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ nss/coreconf/Linux.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
+index d07f8a3c5..4b45a6054 100644
+--- a/nss/coreconf/Linux.mk
++++ b/nss/coreconf/Linux.mk
+@@ -132,7 +132,7 @@ endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DHAVE_STRERROR
+ ifeq ($(KERNEL),Linux)
+- OS_CFLAGS += -DLINUX -Dlinux
++ DEFINES += -DLINUX -Dlinux
+ endif
+ OS_LIBS = $(OS_PTHREAD) -ldl -lc
+
+--
+2.20.1
+
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/libnss: remove patch
2019-12-12 14:01 [Buildroot] [PATCH 0/2] package/libnss: fix build and remove a patch Giulio Benetti
2019-12-12 14:01 ` [Buildroot] [PATCH 1/2] package/libnss: fix build failure on RHEL 7 Giulio Benetti
@ 2019-12-12 14:01 ` Giulio Benetti
2019-12-23 22:46 ` Thomas Petazzoni
1 sibling, 1 reply; 5+ messages in thread
From: Giulio Benetti @ 2019-12-12 14:01 UTC (permalink / raw)
To: buildroot
Remove uClibc fix patch since its change has been upstreamed despite the
comment contained in patch.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
... 0001-add-zlib-include-dir-variable.patch} | 0
package/libnss/0001-fix-uclibc-build.patch | 22 -------------------
...uild-failure-due-to-missing-posix-s.patch} | 0
...ix-PowerPc-build-sys-auxv.h-failure.patch} | 0
...nsinstall.c-build-failure-on-RHEL-7.patch} | 0
5 files changed, 22 deletions(-)
rename package/libnss/{0002-add-zlib-include-dir-variable.patch => 0001-add-zlib-include-dir-variable.patch} (100%)
delete mode 100644 package/libnss/0001-fix-uclibc-build.patch
rename package/libnss/{0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch => 0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch} (100%)
rename package/libnss/{0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch => 0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch} (100%)
rename package/libnss/{0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch => 0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch} (100%)
diff --git a/package/libnss/0002-add-zlib-include-dir-variable.patch b/package/libnss/0001-add-zlib-include-dir-variable.patch
similarity index 100%
rename from package/libnss/0002-add-zlib-include-dir-variable.patch
rename to package/libnss/0001-add-zlib-include-dir-variable.patch
diff --git a/package/libnss/0001-fix-uclibc-build.patch b/package/libnss/0001-fix-uclibc-build.patch
deleted file mode 100644
index a9e84c264b..0000000000
--- a/package/libnss/0001-fix-uclibc-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix build with uClibc-ng
-
-The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in
-the code.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: Not upstreamable; uClibc needs to update elf.h
-
-diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c
---- nss-3.38.orig/nss/lib/freebl/blinit.c 2018-06-21 12:24:45.000000000 +0300
-+++ nss-3.38/nss/lib/freebl/blinit.c 2018-06-26 13:13:55.636434720 +0300
-@@ -100,6 +100,9 @@
- defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
- #include <sys/auxv.h>
- extern unsigned long getauxval(unsigned long type) __attribute__((weak));
-+#ifndef AT_HWCAP2
-+#define AT_HWCAP2 26
-+#endif
- #else
- static unsigned long (*getauxval)(unsigned long) = NULL;
- #define AT_HWCAP2 0
diff --git a/package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch
similarity index 100%
rename from package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch
rename to package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch
diff --git a/package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch b/package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
similarity index 100%
rename from package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
rename to package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch
diff --git a/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
similarity index 100%
rename from package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
rename to package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/2] package/libnss: remove patch
2019-12-12 14:01 ` [Buildroot] [PATCH 2/2] package/libnss: remove patch Giulio Benetti
@ 2019-12-23 22:46 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-12-23 22:46 UTC (permalink / raw)
To: buildroot
On Thu, 12 Dec 2019 15:01:18 +0100
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:
> Remove uClibc fix patch since its change has been upstreamed despite the
> comment contained in patch.
>
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
> ... 0001-add-zlib-include-dir-variable.patch} | 0
> package/libnss/0001-fix-uclibc-build.patch | 22 -------------------
> ...uild-failure-due-to-missing-posix-s.patch} | 0
> ...ix-PowerPc-build-sys-auxv.h-failure.patch} | 0
> ...nsinstall.c-build-failure-on-RHEL-7.patch} | 0
> 5 files changed, 22 deletions(-)
> rename package/libnss/{0002-add-zlib-include-dir-variable.patch => 0001-add-zlib-include-dir-variable.patch} (100%)
> delete mode 100644 package/libnss/0001-fix-uclibc-build.patch
> rename package/libnss/{0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch => 0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch} (100%)
> rename package/libnss/{0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch => 0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch} (100%)
> rename package/libnss/{0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch => 0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch} (100%)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-23 22:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-12 14:01 [Buildroot] [PATCH 0/2] package/libnss: fix build and remove a patch Giulio Benetti
2019-12-12 14:01 ` [Buildroot] [PATCH 1/2] package/libnss: fix build failure on RHEL 7 Giulio Benetti
2019-12-23 22:46 ` Thomas Petazzoni
2019-12-12 14:01 ` [Buildroot] [PATCH 2/2] package/libnss: remove patch Giulio Benetti
2019-12-23 22:46 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox