diff options
author | Markus Pargmann <mpa@pengutronix.de> | 2014-05-08 10:00:31 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-05-08 10:33:59 +0200 |
commit | 1e7df5293cd185c8630a302b09572be08ee61656 (patch) | |
tree | 6c0d9619eed7790c06582642f3937664937e00dd /patches | |
parent | 38081346eee72d9ad3398f27e35cc2a3d2ff9754 (diff) | |
download | ptxdist-1e7df5293cd185c8630a302b09572be08ee61656.tar.gz ptxdist-1e7df5293cd185c8630a302b09572be08ee61656.tar.xz |
iproute2: version bump 3.9.0 -> 3.14.0
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/iproute2-3.14.0/0001-build-system-fixes.patch (renamed from patches/iproute2-3.9.0/0001-build-system-fixes.patch) | 14 | ||||
-rw-r--r-- | patches/iproute2-3.14.0/series (renamed from patches/iproute2-3.9.0/series) | 0 |
2 files changed, 10 insertions, 4 deletions
diff --git a/patches/iproute2-3.9.0/0001-build-system-fixes.patch b/patches/iproute2-3.14.0/0001-build-system-fixes.patch index df40efac5..1d7a8fe10 100644 --- a/patches/iproute2-3.9.0/0001-build-system-fixes.patch +++ b/patches/iproute2-3.14.0/0001-build-system-fixes.patch @@ -1,3 +1,4 @@ +From 21ba3bd71071e8d9062e54d52681defd1250c6a9 Mon Sep 17 00:00:00 2001 From: Juergen Beisert <juergen@kreuzholzen.de> Date: Sun, 16 Jun 2013 11:17:42 +0200 Subject: [PATCH] build system fixes @@ -7,12 +8,14 @@ Add a mechanism to feed in CPPFLAGS for cross builds. Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de> Signed-off-by: Jon Ringle <jon@ringle.org> +[Rebased to 3.14.0] +Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- misc/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/misc/Makefile b/misc/Makefile -index a59ff87..4e65239 100644 +index 004bcc3..34af65c 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,10 +1,14 @@ @@ -28,6 +31,9 @@ index a59ff87..4e65239 100644 +TARGETS += arpd +endif + - all: $(TARGETS) - - ss: $(SSOBJ) + ifeq ($(HAVE_SELINUX),y) + LDLIBS += $(shell pkg-config --libs libselinux) + CFLAGS += $(shell pkg-config --cflags libselinux) -DHAVE_SELINUX +-- +1.9.0 + diff --git a/patches/iproute2-3.9.0/series b/patches/iproute2-3.14.0/series index 630efcf86..630efcf86 100644 --- a/patches/iproute2-3.9.0/series +++ b/patches/iproute2-3.14.0/series |