diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-07-20 14:10:25 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-07-20 14:10:25 +0000 |
| commit | 0044ccd6dcc6b34f5f567fe1f2a458b8dd352ae9 (patch) | |
| tree | 560a7f5bc3c63eb0da21fb99b5ce4d7955f9d252 /net-analyzer | |
| parent | Don't pull in dev-qt/qtphonon. (diff) | |
| download | gentoo-2-0044ccd6dcc6b34f5f567fe1f2a458b8dd352ae9.tar.gz gentoo-2-0044ccd6dcc6b34f5f567fe1f2a458b8dd352ae9.tar.bz2 gentoo-2-0044ccd6dcc6b34f5f567fe1f2a458b8dd352ae9.zip | |
Reproduce upstream commit to fix building on OSX, bug #476736
(Portage version: 2.2.01.22124-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/mtr/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/mtr/mtr-0.85.ebuild | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog index 45a7411961f3..3f7acc62a187 100644 --- a/net-analyzer/mtr/ChangeLog +++ b/net-analyzer/mtr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/mtr # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.138 2013/07/12 18:27:27 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.139 2013/07/20 14:10:25 grobian Exp $ + + 20 Jul 2013; Fabian Groffen <grobian@gentoo.org> mtr-0.85.ebuild: + Reproduce upstream commit to fix building on OSX, bug #476736 12 Jul 2013; Jason A. Donenfeld <zx2c4@gentoo.org> mtr-0.85.ebuild: Clean up upstream's .o files that cause build issues. diff --git a/net-analyzer/mtr/mtr-0.85.ebuild b/net-analyzer/mtr/mtr-0.85.ebuild index 0099459f520c..3f0cc3115b8b 100644 --- a/net-analyzer/mtr/mtr-0.85.ebuild +++ b/net-analyzer/mtr/mtr-0.85.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/net-analyzer/mtr/mtr-0.85.ebuild,v 1.6 2013/07/12 18:27:27 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.85.ebuild,v 1.7 2013/07/20 14:10:25 grobian Exp $ EAPI=5 inherit eutils autotools flag-o-matic @@ -32,6 +32,10 @@ src_prepare() { "${FILESDIR}"/0.85-ipv6.patch \ "${FILESDIR}"/0.85-gtk.patch + # https://github.com/traviscross/mtr/commit/2a08115f2c026232e2172db7f894d12306594d1d + # https://bugs.gentoo.org/show_bug.cgi?id=476736 + sed -i -e '/#ifndef __APPLE__/s/ifndef/ifdef/' asn.c || die' + # Keep this comment and following mv, even in case ebuild does not need # it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 #222909 |