Skip to contentSkip to conversation

ndisc6: patch no longer required

PATCH New Waldemar Brodkorb 2 participants 4 messages Jun 27, 2017 – Jul 22, 2017

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH 1/1 ndisc6: patch no longer required

In uClibc-ng 1.0.25 the issue was fixed and FAVOR_BSD is gone.

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch | 64 ----------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch
package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch deleted +0 -64
deleted file mode 100644
index f84719c..0000000
@@ -1,64 +0,0 @@
-From 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Thu, 26 Apr 2012 23:45:25 +0200
-Subject: [PATCH] trace-{tcp,udp}.c: fix build on uClibc
-
-Selection of the BSD variant of struct tcphdr/udphdr on uClibc fails
-because of config.h. This is caused by config.h setting _GNU_SOURCE
-and the compat handling (uClibc doesn't have inet6_rth_*) including
-sys/types.h which in term includes features.h, which figures out
-what bsd/gnu/posix variant to use because of:
-
- /* If _BSD_SOURCE was defined by the user, favor BSD over POSIX.  */
- #if defined _BSD_SOURCE && \
-    !(defined _POSIX_SOURCE || defined _POSIX_C_SOURCE || \
-      defined _XOPEN_SOURCE || defined _XOPEN_SOURCE_EXTENDED || \
-      defined _GNU_SOURCE || defined _SVID_SOURCE)
- # define __FAVOR_BSD    1
- #endif
-
-The current workaround of undefining _GNU_SOURCE after config.h doesn't
-work as features.h has already been evaluated by then. Instead, simply
-don't include config.h as it isn't needed in these two files.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/trace-tcp.c |    5 -----
- src/trace-udp.c |    5 -----
- 2 files changed, 10 deletions(-)
-
-diff --git a/src/trace-tcp.c b/src/trace-tcp.c
-index 6a7732d..91b64c2 100644
---- a/src/trace-tcp.c
-+++ b/src/trace-tcp.c
-@@ -17,11 +17,6 @@
-  *  along with this program. If not, see <http://www.gnu.org/licenses/>. *
-  *************************************************************************/
- 
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#undef _GNU_SOURCE
- #define _BSD_SOURCE 1
- 
- #include <string.h>
-diff --git a/src/trace-udp.c b/src/trace-udp.c
-index 821c24c..1754338 100644
---- a/src/trace-udp.c
-+++ b/src/trace-udp.c
-@@ -17,11 +17,6 @@
-  *  along with this program. If not, see <http://www.gnu.org/licenses/>. *
-  *************************************************************************/
- 
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#undef _GNU_SOURCE
- #define _BSD_SOURCE 1
- 
- #include <string.h>
--- 
-1.7.10
-
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 ndisc6: patch no longer required

Hello,

Quoted 1 line · Waldemar Brodkorb

In uClibc-ng 1.0.25 the issue was fixed and FAVOR_BSD is gone.

This is not true I believe: the problem was fixed in uClibc commit 58a5ba12bffad5916d9897c2870fc483f1db8282, which is *not* in 1.0.25. So the problem is fixed only with uClibc-ng 1.0.25 + the patch currently in package/uclibc/.

So I need to hold off on this until I rebuild all the toolchains with the latest uClibc-ng 1.0.25 + patch.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 ndisc6: patch no longer required

Hi Thomas,

Quoted 7 lines

Am 01.07.2017 um 10:09 schrieb Thomas Petazzoni <[email protected]>:

Hello,

Quoted 2 lines · Waldemar Brodkorb

In uClibc-ng 1.0.25 the issue was fixed and FAVOR_BSD is gone.

Quoted 7 lines

This is not true I believe: the problem was fixed in uClibc commit 58a5ba12bffad5916d9897c2870fc483f1db8282, which is *not* in 1.0.25. So the problem is fixed only with uClibc-ng 1.0.25 + the patch currently in package/uclibc/.

So I need to hold off on this until I rebuild all the toolchains with the latest uClibc-ng 1.0.25 + patch

Good catch. You are right.

best regards
Waldemar

Applied
#3 lore raw

PATCH 1/1 ndisc6: patch no longer required

In reply to Waldemar Brodkorb

Hello,

Quoted 7 lines · Waldemar Brodkorb

In uClibc-ng 1.0.25 the issue was fixed and FAVOR_BSD is gone.

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch | 64 ----------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch

Applied to master, after reworking the commit log (the fix isn't in uClibc-ng 1.0.25).

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com