aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Waldemar Brodkorb <wbx@openadk.org>2017-06-27 21:08:33 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-22 23:40:14 +0200
commit94d5820fa7a57b5eedb9acb5b2187f62dc4e4b55 (patch)
tree4fb204014e860d105f98429af750c1981c6902d2
parent827fa4f917b1b4abc126e22631d0b98dd2293aed (diff)
downloadbuildroot-94d5820fa7a57b5eedb9acb5b2187f62dc4e4b55.tar.gz
buildroot-94d5820fa7a57b5eedb9acb5b2187f62dc4e4b55.tar.bz2
ndisc6: patch no longer required
Now that we have 0001-remove-__FAVOR_BSD.patch in uClibc-ng (which is upstream and will be part of uClibc-ng 1.0.26), we no longer need the work-around patch in the ndisc6 package. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch b/package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch
deleted file mode 100644
index f84719cf36..0000000000
--- a/package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-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 <jacmet@sunsite.dk>
----
- 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
-