summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-10-10 19:28:06 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-10-10 19:28:06 +0000
commitc6464621cac026a57aa3cbe5edb1e381344d0821 (patch)
tree18e40f82e583803f419dc5bc2f7b16b5db1f03b0 /app-misc
parentUse _python_package_supporting_installation_for_multiple_python_abis() instea... (diff)
downloadgentoo-2-c6464621cac026a57aa3cbe5edb1e381344d0821.tar.gz
gentoo-2-c6464621cac026a57aa3cbe5edb1e381344d0821.tar.bz2
gentoo-2-c6464621cac026a57aa3cbe5edb1e381344d0821.zip
Fixing bug #335219
(Portage version: 2.2_rc91/cvs/Linux i686)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/rio/ChangeLog8
-rw-r--r--app-misc/rio/files/rio-1.0.7-makefile.patch2
-rw-r--r--app-misc/rio/rio-1.0.7-r1.ebuild16
3 files changed, 15 insertions, 11 deletions
diff --git a/app-misc/rio/ChangeLog b/app-misc/rio/ChangeLog
index 35ce4c44a8e1..cbb3748b6863 100644
--- a/app-misc/rio/ChangeLog
+++ b/app-misc/rio/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/rio
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rio/ChangeLog,v 1.10 2009/09/23 16:07:04 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rio/ChangeLog,v 1.11 2010/10/10 19:28:06 gurligebis Exp $
+
+ 10 Oct 2010; <gurligebis@gentoo.org> rio-1.0.7-r1.ebuild,
+ files/rio-1.0.7-makefile.patch:
+ Fixing LDFLAGS problem wrt. bug #335219
23 Sep 2009; Patrick Lauer <patrick@gentoo.org> rio-1.0.7-r1.ebuild:
Remove virtual/libc
diff --git a/app-misc/rio/files/rio-1.0.7-makefile.patch b/app-misc/rio/files/rio-1.0.7-makefile.patch
index 8a646f658dd3..5a022f691d93 100644
--- a/app-misc/rio/files/rio-1.0.7-makefile.patch
+++ b/app-misc/rio/files/rio-1.0.7-makefile.patch
@@ -6,7 +6,7 @@
rio: app.cpp rio.cpp
- g++ -O1 -o rio app.cpp rio.cpp
- chmod +s rio
-+ $(CXX) $(CXXFLAGS) -o rio app.cpp rio.cpp
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o rio app.cpp rio.cpp
+
+# suid binaries BAD! use sudo!
+# chmod +s rio
diff --git a/app-misc/rio/rio-1.0.7-r1.ebuild b/app-misc/rio/rio-1.0.7-r1.ebuild
index e4f0fc3db07f..eab5b060217c 100644
--- a/app-misc/rio/rio-1.0.7-r1.ebuild
+++ b/app-misc/rio/rio-1.0.7-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rio/rio-1.0.7-r1.ebuild,v 1.4 2009/09/23 16:07:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rio/rio-1.0.7-r1.ebuild,v 1.5 2010/10/10 19:28:06 gurligebis Exp $
+
+EAPI="2"
inherit eutils toolchain-funcs
@@ -18,12 +20,10 @@ RDEPEND=""
S="${WORKDIR}/${PN}${PV//./}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-makefile.patch
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-includes.patch
+src_prepare() {
+ epatch "${FILESDIR}/${P}-makefile.patch"
+ epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${P}-includes.patch"
}
src_compile() {