Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
config BR2_PACKAGE_NDISC6
|
||||
bool "ndisc6 tools"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
NDisc6 is a small collection of useful tools for IPv6 networking
|
||||
NDisc6 is a small collection of useful tools for IPv6
|
||||
networking
|
||||
|
||||
http://www.remlab.net/ndisc6/
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a ndisc6-1.0.2.tar.bz2
|
||||
sha256 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 ndisc6-1.0.3.tar.bz2
|
||||
|
||||
@@ -4,18 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NDISC6_VERSION = 1.0.2
|
||||
NDISC6_VERSION = 1.0.3
|
||||
NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
|
||||
NDISC6_SITE = http://www.remlab.net/files/ndisc6
|
||||
NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
|
||||
NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" LIBS=$(TARGET_NLS_LIBS)
|
||||
NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install
|
||||
NDISC6_LICENSE = GPLv2 or GPLv3
|
||||
NDISC6_LICENSE = GPL-2.0 or GPL-3.0
|
||||
NDISC6_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
NDISC6_DEPENDENCIES += gettext
|
||||
NDISC6_CONF_ENV += LIBS="-lintl"
|
||||
endif
|
||||
NDISC6_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
NDISC6_BIN_ += dnssort # perl script
|
||||
NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name
|
||||
|
||||
Reference in New Issue
Block a user