summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2009-01-04 16:18:05 +0000
committerHanno Böck <hanno@gentoo.org>2009-01-04 16:18:05 +0000
commit6c4c50b4e5bbdabdf41d6766f61b49884b1eaa9a (patch)
tree4b73a0d2e5906ed2fdabdf657ce67052bdcbd9b9 /www-client/midori
parentamd64/x86 stable, bug #253611 (diff)
downloadgentoo-2-6c4c50b4e5bbdabdf41d6766f61b49884b1eaa9a.tar.gz
gentoo-2-6c4c50b4e5bbdabdf41d6766f61b49884b1eaa9a.tar.bz2
gentoo-2-6c4c50b4e5bbdabdf41d6766f61b49884b1eaa9a.zip
midori: fix multilib installation and respect ldflags and cflags
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'www-client/midori')
-rw-r--r--www-client/midori/ChangeLog7
-rw-r--r--www-client/midori/midori-9999.ebuild8
2 files changed, 9 insertions, 6 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 826b3b37e0d0..98937c3ca98f 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/midori
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.6 2008/10/27 19:17:29 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.7 2009/01/04 16:18:05 hanno Exp $
+
+ 04 Jan 2009; Hanno Boeck <hanno@gentoo.org> midori-9999.ebuild:
+ Fix multilib installation, respect CFLAGS and LDFLAGS.
27 Oct 2008; Markus Ullmann <jokey@gentoo.org> metadata.xml,
midori-9999.ebuild:
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 44007e43caf6..d8dd0b9689a2 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.8 2008/10/27 19:17:29 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.9 2009/01/04 16:18:05 hanno Exp $
-inherit git eutils
+inherit git eutils multilib
DESCRIPTION="A lightweight web browser"
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -25,7 +25,7 @@ pkg_setup() {
}
src_compile() {
- ./waf --prefix="/usr/" configure || die "waf configure failed."
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf --prefix="/usr/" --libdir="/usr/$(get_libdir)/" configure || die "waf configure failed."
./waf build || die "waf build failed."
}