summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2010-06-01 19:24:12 +0000
committerHans de Graaff <graaff@gentoo.org>2010-06-01 19:24:12 +0000
commit9030d8503066ec7af5e83170becdb8a6bb58de0a (patch)
treeedd0f27ee53735e42b90735f526c57fe98600e27 /app-misc
parentVersion bump (diff)
downloadgentoo-2-9030d8503066ec7af5e83170becdb8a6bb58de0a.tar.gz
gentoo-2-9030d8503066ec7af5e83170becdb8a6bb58de0a.tar.bz2
gentoo-2-9030d8503066ec7af5e83170becdb8a6bb58de0a.zip
Fix compilation against latest dev-lang/ruby ebuild. Link against stdc++. Fix insecure RUNPATH.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/booh/ChangeLog7
-rw-r--r--app-misc/booh/booh-0.9.2.2.ebuild5
-rw-r--r--app-misc/booh/files/booh-0.9.2.2-stdc.patch11
3 files changed, 21 insertions, 2 deletions
diff --git a/app-misc/booh/ChangeLog b/app-misc/booh/ChangeLog
index 2d989b724fff..f1c9cfb98bd9 100644
--- a/app-misc/booh/ChangeLog
+++ b/app-misc/booh/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/booh
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.25 2010/04/24 19:22:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.26 2010/06/01 19:24:11 graaff Exp $
+
+ 01 Jun 2010; Hans de Graaff <graaff@gentoo.org> booh-0.9.2.2.ebuild,
+ +files/booh-0.9.2.2-stdc.patch:
+ Fix compilation against latest dev-lang/ruby ebuild. Link against stdc++.
+ Fix insecure RUNPATH.
24 Apr 2010; Hans de Graaff <graaff@gentoo.org> booh-0.9.2.2.ebuild:
Fix *magick dependency according to bugs 297830 and 314213.
diff --git a/app-misc/booh/booh-0.9.2.2.ebuild b/app-misc/booh/booh-0.9.2.2.ebuild
index f83c5770e979..0784c739ace0 100644
--- a/app-misc/booh/booh-0.9.2.2.ebuild
+++ b/app-misc/booh/booh-0.9.2.2.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/app-misc/booh/booh-0.9.2.2.ebuild,v 1.3 2010/04/24 19:22:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.2.2.ebuild,v 1.4 2010/06/01 19:24:11 graaff Exp $
EAPI="2"
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.9.1-require_gems.patch
+ epatch "${FILESDIR}"/${P}-stdc.patch
# Remove scripts requiring gtk if gtk is not used
if ! use gtk; then
@@ -43,6 +44,8 @@ src_configure() {
ruby setup.rb setup || die "ruby setup.rb setup failed"
cd ext
ruby extconf.rb || die "ruby extconf.rb failed"
+ sed -i -e 's:-Wl,--no-undefined ::' Makefile || die "--no-undefined removal failed"
+ sed -i -e 's:-Wl,-R$(libdir)::' -e 's:-Wl,-R -Wl,$(libdir)::' Makefile || die "Fix insecure RUNPATH failed"
}
src_install() {
diff --git a/app-misc/booh/files/booh-0.9.2.2-stdc.patch b/app-misc/booh/files/booh-0.9.2.2-stdc.patch
new file mode 100644
index 000000000000..66a7d4a66bce
--- /dev/null
+++ b/app-misc/booh/files/booh-0.9.2.2-stdc.patch
@@ -0,0 +1,11 @@
+--- ext/extconf.rb.orig 2010-06-01 20:33:10.544558767 +0200
++++ ext/extconf.rb 2010-06-01 21:12:28.380808877 +0200
+@@ -16,6 +16,8 @@
+ #- does it do something good, actually?
+ setup_win32(PACKAGE_NAME)
+
++have_library('stdc++')
++
+ begin
+ create_makefile_at_srcdir(PACKAGE_NAME, File.dirname(__FILE__))
+ rescue NoMethodError