diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-09-01 17:45:51 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-09-01 17:45:51 +0000 |
| commit | 0de15c2a22e72852493b74b9e7bac5fd23dd09a5 (patch) | |
| tree | a7fb885e0df8769a25de2b65ec53429176cc87c5 /dev-libs | |
| parent | Version bump to latest. Prune some older versions. (diff) | |
| download | gentoo-2-0de15c2a22e72852493b74b9e7bac5fd23dd09a5.tar.gz gentoo-2-0de15c2a22e72852493b74b9e7bac5fd23dd09a5.tar.bz2 gentoo-2-0de15c2a22e72852493b74b9e7bac5fd23dd09a5.zip | |
Fix building with USE=-doc by Ben Kohler (bug #433565), patch by Martin Jansa.
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libnl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libnl/files/libnl-3.2.12-doc.patch | 19 | ||||
| -rw-r--r-- | dev-libs/libnl/libnl-3.2.12.ebuild | 9 |
3 files changed, 31 insertions, 4 deletions
diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog index 3cc8e8ed60cf..9bcd5c568d28 100644 --- a/dev-libs/libnl/ChangeLog +++ b/dev-libs/libnl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libnl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.96 2012/08/31 14:46:27 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.97 2012/09/01 17:45:51 jer Exp $ + + 01 Sep 2012; Jeroen Roovers <jer@gentoo.org> libnl-3.2.12.ebuild, + +files/libnl-3.2.12-doc.patch: + Fix building with USE=-doc by Ben Kohler (bug #433565), patch by Martin + Jansa. *libnl-3.2.12 (31 Aug 2012) diff --git a/dev-libs/libnl/files/libnl-3.2.12-doc.patch b/dev-libs/libnl/files/libnl-3.2.12-doc.patch new file mode 100644 index 000000000000..35789e802bc6 --- /dev/null +++ b/dev-libs/libnl/files/libnl-3.2.12-doc.patch @@ -0,0 +1,19 @@ +--- a/configure.in ++++ b/configure.in +@@ -147,12 +147,12 @@ + AC_MSG_WARN([*** Disabling API linking due to missing doxygen package]) + link_doc=no + fi +- +- AM_CONDITIONAL([LINK_DOC], [test "x$link_doc" = "xyes"]) +- AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$HAVE_DOXYGEN" = "xyes"]) +- AM_CONDITIONAL([HAVE_ASCIIDOC], [test "x$HAVE_ASCIIDOC" = "xyes"]) + fi + ++AM_CONDITIONAL([LINK_DOC], [test "x$link_doc" = "xyes"]) ++AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$HAVE_DOXYGEN" = "xyes"]) ++AM_CONDITIONAL([HAVE_ASCIIDOC], [test "x$HAVE_ASCIIDOC" = "xyes"]) ++ + AM_CONDITIONAL([GENERATE_DOC], [test "x$generate_doc" != "xno"]) + + AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], diff --git a/dev-libs/libnl/libnl-3.2.12.ebuild b/dev-libs/libnl/libnl-3.2.12.ebuild index d183310985d1..2a9f81147ee2 100644 --- a/dev-libs/libnl/libnl-3.2.12.ebuild +++ b/dev-libs/libnl/libnl-3.2.12.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.12.ebuild,v 1.1 2012/08/31 14:46:27 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.12.ebuild,v 1.2 2012/09/01 17:45:51 jer Exp $ EAPI=4 -inherit eutils multilib +inherit autotools eutils multilib DESCRIPTION="A library for applications dealing with netlink socket" HOMEPAGE="http://www.infradead.org/~tgr/libnl/" @@ -26,7 +26,10 @@ DEPEND=" " src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch + epatch \ + "${FILESDIR}"/${PN}-1.1-vlan-header.patch \ + "${FILESDIR}"/${P}-doc.patch + eautoreconf } src_configure() { |