diff options
author | Jeroen Roovers <jer@gentoo.org> | 2015-01-19 15:24:46 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2015-01-19 15:24:46 +0000 |
commit | b3a7a9420d6a125171a8c169ed2d9416b88fd048 (patch) | |
tree | 917616c58038b54ec23ef0dc99f9b1bb1db8fd44 /dev-ruby | |
parent | Stable on arm, ppc, ppc64 and x86. Bug #530424. (diff) | |
download | gentoo-2-b3a7a9420d6a125171a8c169ed2d9416b88fd048.tar.gz gentoo-2-b3a7a9420d6a125171a8c169ed2d9416b88fd048.tar.bz2 gentoo-2-b3a7a9420d6a125171a8c169ed2d9416b88fd048.zip |
Fix some USE=graph issues.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-ruby')
-rw-r--r-- | dev-ruby/rrdtool-bindings/ChangeLog | 6 | ||||
-rw-r--r-- | dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-ruby/rrdtool-bindings/ChangeLog b/dev-ruby/rrdtool-bindings/ChangeLog index 8a64378f7d8a..c1dc01505a59 100644 --- a/dev-ruby/rrdtool-bindings/ChangeLog +++ b/dev-ruby/rrdtool-bindings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/rrdtool-bindings # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/ChangeLog,v 1.15 2015/01/19 15:13:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/ChangeLog,v 1.16 2015/01/19 15:24:46 jer Exp $ + + 19 Jan 2015; Jeroen Roovers <jer@gentoo.org> + rrdtool-bindings-1.5.0_rc1.ebuild: + Fix some USE=graph issues. *rrdtool-bindings-1.5.0_rc1 (19 Jan 2015) diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild index 402d40d2905c..4a63c98cb5bc 100644 --- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild +++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild,v 1.1 2015/01/19 15:13:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild,v 1.2 2015/01/19 15:24:46 jer Exp $ EAPI="5" @@ -38,8 +38,11 @@ RUBY_PATCHES=( ) each_ruby_configure() { + rm ../../src/rrd_config.h || die + touch ../../src/rrd_config.h || die + ${RUBY} extconf.rb \ - --with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH '')" || die + --with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die } each_ruby_compile() { @@ -47,7 +50,9 @@ each_ruby_compile() { } each_ruby_test() { - ${RUBY} -I. test.rb || die + if use graph; then + ${RUBY} -I. test.rb || die + fi } all_ruby_install() { |