package/libnss: fix build and remove a patch
cover package/libnss: fix build and remove a patch
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.patchSignature · 1 line
2.20.1
PATCH 1/2 package/libnss: fix build failure on RHEL 7
-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.
---
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
package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 1ba8516045bc8a13fd72e1a85206a04b29d96758 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +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 <[email protected]> +--- + 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 +
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/2 package/libnss: fix build failure on RHEL 7
Quoted 6 lines · On Thu, 12 Dec 2019 15:01:17 +0100 Giulio Benetti…
-DLINUX flag was passed to
OS_CFLAGSinstead of DEFINES, butOS_CFLAGSis only used when cross-compiling, not when native building.Add patch to fix build failure on RHEL 7 host by substituting
OS_CFLAGSwith DEFINES.
Quoted 8 lines
Signed-off-by Giulio Benetti <[email protected]>---
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
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/libnss: remove patch
In reply to Giulio BenettiRemove uClibc fix patch since its change has been upstreamed despite the comment contained in 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} | 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%)package/libnss/0001-add-zlib-include-dir-variable.patch renamed from package/libnss/0002-add-zlib-include-dir-variable.patch +0 -0
package/libnss/0001-fix-uclibc-build.patch deleted +0 -22
@@ -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 <[email protected]> ---- -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
package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch renamed from package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch +0 -0
package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch renamed from package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch +0 -0
package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch renamed from package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch +0 -0
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 2/2 package/libnss: remove patch
Quoted 4 lines · On Thu, 12 Dec 2019 15:01:18 +0100 Giulio Benetti…
Remove uClibc fix patch since its change has been upstreamed despite the comment contained in patch.
Signed-off-by Giulio Benetti <[email protected]>
Quoted 12 lines
---
... 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com