summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/libnl/ChangeLog9
-rw-r--r--dev-libs/libnl/files/libnl-3.2.22-python.patch18
-rw-r--r--dev-libs/libnl/libnl-3.2.22-r2.ebuild (renamed from dev-libs/libnl/libnl-3.2.22-r1.ebuild)5
3 files changed, 29 insertions, 3 deletions
diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog
index bdb23fc06d66..f048ddad0400 100644
--- a/dev-libs/libnl/ChangeLog
+++ b/dev-libs/libnl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/libnl
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.181 2013/07/16 22:46:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.182 2013/07/16 23:24:27 jer Exp $
+
+*libnl-3.2.22-r2 (16 Jul 2013)
+
+ 16 Jul 2013; Jeroen Roovers <jer@gentoo.org> -libnl-3.2.22-r1.ebuild,
+ +libnl-3.2.22-r2.ebuild, +files/libnl-3.2.22-python.patch:
+ Fix python extension linking (bug #477110 by Arfrever Frehtes Taifersar
+ Arahesis).
16 Jul 2013; Jeroen Roovers <jer@gentoo.org> libnl-3.2.22-r1.ebuild:
DEPEND on dev-lang/swig for python support by Arfrever Frehtes Taifersar
diff --git a/dev-libs/libnl/files/libnl-3.2.22-python.patch b/dev-libs/libnl/files/libnl-3.2.22-python.patch
new file mode 100644
index 000000000000..feef7124b27b
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.2.22-python.patch
@@ -0,0 +1,18 @@
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -9,6 +9,7 @@
+ sources = ['netlink/capi.i'],
+ include_dirs = include,
+ swig_opts = opts,
++ library_dirs=['@top_builddir@/lib/.libs'],
+ libraries = ['nl-3'],
+ )
+
+@@ -16,6 +17,7 @@
+ sources = ['netlink/route/capi.i'],
+ include_dirs = include,
+ swig_opts = opts,
++ library_dirs=['@top_builddir@/lib/.libs'],
+ libraries = ['nl-3', 'nl-route-3'],
+ )
+
diff --git a/dev-libs/libnl/libnl-3.2.22-r1.ebuild b/dev-libs/libnl/libnl-3.2.22-r2.ebuild
index 4cae9667cb19..da655cccfbbd 100644
--- a/dev-libs/libnl/libnl-3.2.22-r1.ebuild
+++ b/dev-libs/libnl/libnl-3.2.22-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.22-r1.ebuild,v 1.3 2013/07/16 22:46:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.22-r2.ebuild,v 1.1 2013/07/16 23:24:27 jer Exp $
EAPI=5
PYTHON_COMPAT=( python2_{6,7} python3_{1,2,3} )
@@ -26,10 +26,11 @@ DEPEND="
DOCS=( ChangeLog )
src_prepare() {
- elibtoolize
epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch
epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch
+ epatch "${FILESDIR}"/${PN}-3.2.22-python.patch
+ elibtoolize
}
src_configure() {