diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-05-29 16:28:53 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-05-29 16:28:53 +0000 |
| commit | f985f9c294529e448313091b6ba3843d019f384c (patch) | |
| tree | 8ba599df384b0e241677826a30dd49fee7cba279 /net-analyzer | |
| parent | x86 stable wrt security bug #300173 (diff) | |
| download | gentoo-2-f985f9c294529e448313091b6ba3843d019f384c.tar.gz gentoo-2-f985f9c294529e448313091b6ba3843d019f384c.tar.bz2 gentoo-2-f985f9c294529e448313091b6ba3843d019f384c.zip | |
Fix space separation between LDFLAGS (bug #321749).
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/rrdtool/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch | 20 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/rrdtool-1.4.3.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index 098b728713b1..22685f66de31 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/rrdtool # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.203 2010/05/26 23:05:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.204 2010/05/29 16:28:53 jer Exp $ + + 29 May 2010; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.3.ebuild, + +files/rrdtool-1.4.3-ruby-ldflags.patch: + Fix space separation between LDFLAGS (bug #321749). *rrdtool-1.4.3 (26 May 2010) diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch new file mode 100644 index 000000000000..8a325f41c608 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch @@ -0,0 +1,20 @@ +--- a/bindings/ruby/extconf.rb ++++ b/bindings/ruby/extconf.rb +@@ -4,13 +4,13 @@ + require 'mkmf' + + if /linux/ =~ RUBY_PLATFORM +- $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib' ++ $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib' + elsif /solaris/ =~ RUBY_PLATFORM +- $LDFLAGS += '-R$(EPREFIX)/lib' ++ $LDFLAGS += ' -R$(EPREFIX)/lib' + elsif /hpux/ =~ RUBY_PLATFORM +- $LDFLAGS += '+b$(EPREFIX)/lib' ++ $LDFLAGS += ' +b$(EPREFIX)/lib' + elsif /aix/ =~ RUBY_PLATFORM +- $LDFLAGS += '-Wl,-blibpath:$(EPREFIX)/lib' ++ $LDFLAGS += ' -Wl,-blibpath:$(EPREFIX)/lib' + end + + dir_config("rrd","../../src","../../src/.libs") diff --git a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild index aa77e487211a..48f81c6d3b8a 100644 --- a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.1 2010/05/26 23:05:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.2 2010/05/29 16:28:53 jer Exp $ EAPI="3" @@ -33,7 +33,8 @@ DEPEND="${RDEPEND} sys-apps/gawk" src_prepare() { - epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch" + epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch" + epatch "${FILESDIR}/${P}-ruby-ldflags.patch" sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694 eautoconf } |