diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-06 00:28:58 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-06 00:28:58 +0000 |
| commit | 4a1e07e3ef2c3c33141cb3d9ada8d017424e23b8 (patch) | |
| tree | 38915ddd1a78098be74651c3fc4b09be7893d9cc /net-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4a1e07e3ef2c3c33141cb3d9ada8d017424e23b8.tar.gz gentoo-2-4a1e07e3ef2c3c33141cb3d9ada8d017424e23b8.tar.bz2 gentoo-2-4a1e07e3ef2c3c33141cb3d9ada8d017424e23b8.zip | |
Fix building against =net-libs/gnet-2.0.8-r2 (bug #528378).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/gsnmp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch | 31 | ||||
| -rw-r--r-- | net-libs/gsnmp/gsnmp-0.3.0.ebuild | 28 |
3 files changed, 56 insertions, 9 deletions
diff --git a/net-libs/gsnmp/ChangeLog b/net-libs/gsnmp/ChangeLog index d3852a3b2f00..a02db5bc0c95 100644 --- a/net-libs/gsnmp/ChangeLog +++ b/net-libs/gsnmp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/gsnmp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gsnmp/ChangeLog,v 1.10 2014/07/16 23:08:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gsnmp/ChangeLog,v 1.11 2014/11/06 00:28:58 jer Exp $ + + 06 Nov 2014; Jeroen Roovers <jer@gentoo.org> gsnmp-0.3.0.ebuild, + +files/gsnmp-0.3.0-pkg_config.patch: + Fix building against =net-libs/gnet-2.0.8-r2 (bug #528378). 16 Jul 2014; Jeroen Roovers <jer@gentoo.org> gsnmp-0.3.0.ebuild: EAPI bump. New HOMEPAGE. diff --git a/net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch b/net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch new file mode 100644 index 000000000000..2e837caa820d --- /dev/null +++ b/net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch @@ -0,0 +1,31 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -21,10 +21,18 @@ + + AC_PROG_LIBTOOL + ++PKG_PROG_PKG_CONFIG ++ + dnl Checks for libraries. + +-AM_PATH_GLIB_2_0(2.0.0) +-AM_PATH_GNET_2_0(2.0.4) ++PKG_CHECK_MODULES(GLIB, glib-2.0 > 2.0.0,[ ++ LIBS="$LIBS $GLIB_LIBS" ++ CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS" ++ ], AC_MSG_ERROR[Could not find glib]) ++PKG_CHECK_MODULES(GNET, gnet-2.0 > 2.0.4,[ ++ LIBS="$LIBS $GNET_LIBS" ++ CPPFLAGS="$CPPFLAGS $GNET_CFLAGS" ++ ], AC_MSG_ERROR[Could not find gnet]) + + dnl Checks for header files. + dnl AC_HEADER_STDC +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,5 +1,3 @@ +-AM_CPPFLAGS = $(GNET_CFLAGS) +- + lib_LTLIBRARIES = libgsnmp.la + libgsnmp_la_SOURCES = ber.c ber.h \ + pdu.c pdu.h \ diff --git a/net-libs/gsnmp/gsnmp-0.3.0.ebuild b/net-libs/gsnmp/gsnmp-0.3.0.ebuild index a192b5cd63bb..b1126da67c19 100644 --- a/net-libs/gsnmp/gsnmp-0.3.0.ebuild +++ b/net-libs/gsnmp/gsnmp-0.3.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gsnmp/gsnmp-0.3.0.ebuild,v 1.10 2014/07/16 23:08:47 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gsnmp/gsnmp-0.3.0.ebuild,v 1.11 2014/11/06 00:28:58 jer Exp $ EAPI=5 -inherit autotools-utils +inherit autotools eutils DESCRIPTION="An SNMP library based on glib and gnet" HOMEPAGE="http://cnds.eecs.jacobs-university.de/users/schoenw/articles/software/index.html" @@ -20,11 +20,23 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${P}-g_access.patch - "${FILESDIR}"/${P}-underquoting.patch -) +DOCS="README" -AUTOTOOLS_IN_SOURCE_BUILD=1 +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-g_access.patch \ + "${FILESDIR}"/${P}-pkg_config.patch \ + "${FILESDIR}"/${P}-underquoting.patch -DOCS=( README ) + eautoreconf +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + + prune_libtool_files +} |