[Buildroot] [PATCH 1/2] Revert "package/libnss: fix build failure on RHEL 7"

Giulio Benetti giulio.benetti at benettiengineering.com
Wed Jan 8 17:07:44 UTC 2020


After discussing upstream here:
https://bugzilla.mozilla.org/show_bug.cgi?id=1603398
it turned out that my patch to fix the bug is wrong. The best way to fix
it is to append -DLINUX to NATIVE_FLAGS in libnss.mk. Next patch is
going to fix this.

This reverts commit fe4b47a12181b89eecb9a8e324f1ad053147f948.

Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
---
 ...-nsinstall.c-build-failure-on-RHEL-7.patch | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch

diff --git a/package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
deleted file mode 100644
index 631d97d11f..0000000000
--- a/package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1ba8516045bc8a13fd72e1a85206a04b29d96758 Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti at 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 at 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



More information about the buildroot mailing list