commit: 47bc9ccf7abfb3054d762f2d9f7b3a1cbeebe612 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Jan 1 19:19:21 2017 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Jan 1 19:23:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bc9ccf
dev-libs/libnl: Fix building against older kernel headers (bug #604190 by pavel sanda). Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/libnl/files/libnl-3.2.20-cache-api.patch | 9 ------- .../libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch | 30 ---------------------- dev-libs/libnl/files/libnl-3.2.28-in6.patch | 12 +++++++++ dev-libs/libnl/libnl-3.2.28.ebuild | 5 ++-- dev-libs/libnl/libnl-3.2.29.ebuild | 5 ++-- dev-libs/libnl/libnl-3.2.9999.ebuild | 11 +++----- 6 files changed, 20 insertions(+), 52 deletions(-) diff --git a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch b/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch deleted file mode 100644 index ce6e47b..00000000 --- a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/tests/test-cache-mngr.c -+++ b/tests/test-cache-mngr.c -@@ -1,5 +1,5 @@ - #include <netlink/netlink.h> --#include <netlink/cache.h> -+#include <netlink/cache-api.h> - #include <netlink/cli/utils.h> - #include <signal.h> - diff --git a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch b/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch deleted file mode 100644 index 09b2f0b..00000000 --- a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/nl-class-add.c -+++ b/src/nl-class-add.c -@@ -14,6 +14,7 @@ - #include <netlink/cli/qdisc.h> - #include <netlink/cli/class.h> - #include <netlink/cli/link.h> -+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */ - - static int quiet = 0; - ---- a/src/nl-cls-add.c -+++ b/src/nl-cls-add.c -@@ -12,6 +12,7 @@ - #include <netlink/cli/tc.h> - #include <netlink/cli/cls.h> - #include <netlink/cli/link.h> -+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */ - - static int quiet = 0; - ---- a/src/nl-qdisc-add.c -+++ b/src/nl-qdisc-add.c -@@ -13,6 +13,7 @@ - #include <netlink/cli/tc.h> - #include <netlink/cli/qdisc.h> - #include <netlink/cli/link.h> -+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */ - - static int quiet = 0; - diff --git a/dev-libs/libnl/files/libnl-3.2.28-in6.patch b/dev-libs/libnl/files/libnl-3.2.28-in6.patch new file mode 100644 index 00000000..5dcf6ae --- /dev/null +++ b/dev-libs/libnl/files/libnl-3.2.28-in6.patch @@ -0,0 +1,12 @@ +https://github.com/thom311/libnl/pull/121 + +--- a/include/linux-private/linux/if_bridge.h ++++ b/include/linux-private/linux/if_bridge.h +@@ -15,7 +15,6 @@ + + #include <linux/types.h> + #include <linux/if_ether.h> +-#include <linux/in6.h> + + #define SYSFS_BRIDGE_ATTR "bridge" + #define SYSFS_BRIDGE_FDB "brforward" diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild index ef5f05a..9c03787 100644 --- a/dev-libs/libnl/libnl-3.2.28.ebuild +++ b/dev-libs/libnl/libnl-3.2.28.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${PN}-1.1-vlan-header.patch - "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - "${FILESDIR}"/${PN}-3.2.20-cache-api.patch + "${FILESDIR}"/${PN}-3.2.28-in6.patch ) src_prepare() { diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild index 5c5c565..56f3021 100644 --- a/dev-libs/libnl/libnl-3.2.29.ebuild +++ b/dev-libs/libnl/libnl-3.2.29.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${PN}-1.1-vlan-header.patch - "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - "${FILESDIR}"/${PN}-3.2.20-cache-api.patch + "${FILESDIR}"/${PN}-3.2.28-in6.patch ) src_prepare() { diff --git a/dev-libs/libnl/libnl-3.2.9999.ebuild b/dev-libs/libnl/libnl-3.2.9999.ebuild index 29a9d87..1c1ea6d 100644 --- a/dev-libs/libnl/libnl-3.2.9999.ebuild +++ b/dev-libs/libnl/libnl-3.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -31,16 +31,13 @@ DEPEND=" sys-devel/flex " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) +" DOCS=( ChangeLog ) -PATCHES=( - "${FILESDIR}"/${PN}-1.1-vlan-header.patch - "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - "${FILESDIR}"/${PN}-3.2.20-cache-api.patch -) MULTILIB_WRAPPED_HEADERS=( # we do not install CLI stuff for non-native
