diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-30 20:21:07 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-05-30 20:21:07 +0000 |
| commit | 55859b1d675c2b158f670fc309061dd926fac34e (patch) | |
| tree | 1f829ad36feec71e176bef5b12fb6b94f7437228 /dev-libs/tntnet | |
| parent | ppc stable #271253 (diff) | |
| download | gentoo-2-55859b1d675c2b158f670fc309061dd926fac34e.tar.gz gentoo-2-55859b1d675c2b158f670fc309061dd926fac34e.tar.bz2 gentoo-2-55859b1d675c2b158f670fc309061dd926fac34e.zip | |
Fix building with >=net-libs/gnutls-2.7.1 (bug #268450).
(Portage version: 13625-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/tntnet')
| -rw-r--r-- | dev-libs/tntnet/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch | 13 | ||||
| -rw-r--r-- | dev-libs/tntnet/tntnet-1.6.3.ebuild | 10 |
3 files changed, 25 insertions, 4 deletions
diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog index 26519b5b8889..2e5292a80d2d 100644 --- a/dev-libs/tntnet/ChangeLog +++ b/dev-libs/tntnet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/tntnet # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.11 2009/03/17 08:10:51 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.12 2009/05/30 20:21:07 arfrever Exp $ + + 30 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + tntnet-1.6.3.ebuild, +files/tntnet-1.6.3-gnutls-2.8.patch: + Fix building with >=net-libs/gnutls-2.7.1 (bug #268450). 17 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> tntnet-1.6.0-r1.ebuild, tntnet-1.6.1.ebuild, tntnet-1.6.2.ebuild, tntnet-1.6.3.ebuild: diff --git a/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch b/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch new file mode 100644 index 000000000000..1d63c820f1ea --- /dev/null +++ b/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch @@ -0,0 +1,13 @@ +--- framework/common/Makefile.am ++++ framework/common/Makefile.am +@@ -117,8 +117,8 @@ + tnt/gcryptinit.h \ + tnt/gnutls.h + +-libtntnet_la_LDFLAGS += `libgnutls-config --libs` +-libtntnet_la_CXXFLAGS += `libgnutls-config --cflags` ++libtntnet_la_LDFLAGS += `pkg-config gnutls --libs` ++libtntnet_la_CXXFLAGS += `pkg-config gnutls --cflags` + endif + + if MAKE_OPENSSL diff --git a/dev-libs/tntnet/tntnet-1.6.3.ebuild b/dev-libs/tntnet/tntnet-1.6.3.ebuild index ab2959d68657..1dea4e295901 100644 --- a/dev-libs/tntnet/tntnet-1.6.3.ebuild +++ b/dev-libs/tntnet/tntnet-1.6.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-1.6.3.ebuild,v 1.4 2009/03/17 08:10:51 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-1.6.3.ebuild,v 1.5 2009/05/30 20:21:07 arfrever Exp $ -inherit eutils +inherit autotools eutils DESCRIPTION="A modular, multithreaded webapplicationserver extensible with C++." HOMEPAGE="http://www.tntnet.org/index.hms" @@ -20,13 +20,17 @@ RDEPEND="dev-libs/cxxtools !gnutls? ( dev-libs/openssl ) )" DEPEND="${RDEPEND} - app-arch/zip" + app-arch/zip + ssl? ( gnutls? ( dev-util/pkgconfig ) )" src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-gcc43.patch" + epatch "${FILESDIR}/${P}-gnutls-2.8.patch" + + eautoreconf } src_compile() { |