Skip to contentSkip to conversation

Revert "package/libnss: fix build failure on RHEL 7"

PATCH New Giulio Benetti 2 participants 4 messages Jan 8, 2020 – Jan 9, 2020

lore
Share & tools
lore
#0 lore raw

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

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.

---
 ...-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
package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch deleted +0 -29
deleted file mode 100644
index 631d97d11f..0000000000
@@ -1,29 +0,0 @@
-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
#1 lore raw

PATCH 2/2 package/libnss: fix build failure on RHEL 7 using -DLINUX

NSS Makefile emits -DLINUX to OS_CFLAGS only if OS_TEST=Linux when building for Target. But nsinstall.c is a host utility and it uses NATIVE_FLAGS instead of OS_CFLAGS, this is why -DLINUX is not emitted. This is necessary for the case one builds for Target OS Linux on a Host OS that is not Linux.

So let's append -DLINUX to NATIVE_FLAGS after HOST_CFLAGS to make sure <getopt.h> is include, since in nsintall.c it is included only if LINUX macro is defined and this caused the build failure not finding getopt functions and macros in some build environment(i.e. RHEL 7). On other build environments getopt.h is indirectly included by unistd.h this is why it worked on them.

Fixes:
http://autobuild.buildroot.net/results/797/797f07ff757e7972d8c96b6a9f6abe68d17e0808/

---
 package/libnss/libnss.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libnss/libnss.mk +1 -1
index 950c9850d3..61950ade25 100644
@@ -68,7 +68,7 @@ define LIBNSS_BUILD_CMDS
 		SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
 		DIST=$(@D)/$(LIBNSS_DISTDIR) \
 		CHECKLOC= \
-		$(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS)"
+		$(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX"
 endef
 
 define LIBNSS_INSTALL_STAGING_CMDS
Signature · 1 line
2.20.1
#2 lore raw

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

In reply to Giulio Benetti

Giulio, All,

On 2020-01-08 18:07 +0100, Giulio Benetti spake thusly:

Quoted 9 lines

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.

I've applied both to master, but as a single commit.

Indeed, this comit removing a patch that fixes a build failure, so all alone, it breaks the build again.

And in case the second patch is not applied, the build stays broken.

and indeed, the two are in fact a single semantic patch: revert a change that upstream deemed incorrect, and aply a fix that upstream suggested as a replqacement for the incorrect patch.

So, I merged both commit in a single one, adapted the commit log, and pushed. Thanks!

Regards,
Yann E. MORIN.

Quoted 47 lines
---
 ...-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
package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch deleted +0 -29
deleted file mode 100644
index 631d97d11f..0000000000
@@ -1,29 +0,0 @@
-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 · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

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

Quoted 18 lines · Yann E. MORIN

Giulio, All,

On 2020-01-08 18:07 +0100, Giulio Benetti spake thusly:

Quoted 9 lines

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.

I've applied both to master, but as a single commit.

Indeed, this comit removing a patch that fixes a build failure, so all alone, it breaks the build again.

Quoted 8 lines

And in case the second patch is not applied, the build stays broken.

and indeed, the two are in fact a single semantic patch: revert a change that upstream deemed incorrect, and aply a fix that upstream suggested as a replqacement for the incorrect patch.

So, I merged both commit in a single one, adapted the commit log, and pushed. Thanks!

I've missed bisection, thank you for fixing it.

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 51 lines

Regards,
Yann E. MORIN.

Quoted 47 lines
---
  ...-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

package/libnss/0003-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch deleted +0 -29
deleted file mode 100644
index 631d97d11f..0000000000
@@ -1,29 +0,0 @@
-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 · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot