summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-08-29 10:58:46 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-08-29 10:58:46 +0000
commit6b44157bc70e02b5d6142fd7ed023ed61059d5c2 (patch)
tree9620ba40d19648c7536784f19bab9a6a0bf6bc9d /x11-wm/wmii
parentUse a different slot for cfengine-3, bug 322237. (diff)
downloadgentoo-2-6b44157bc70e02b5d6142fd7ed023ed61059d5c2.tar.gz
gentoo-2-6b44157bc70e02b5d6142fd7ed023ed61059d5c2.tar.bz2
gentoo-2-6b44157bc70e02b5d6142fd7ed023ed61059d5c2.zip
Fix build with gmake 3.82 wrt bug 335083. Thanks to Diego for the report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/wmii')
-rw-r--r--x11-wm/wmii/ChangeLog5
-rw-r--r--x11-wm/wmii/wmii-3.9.2-r1.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index aae3cde7f4f7..b710869d1bd4 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/wmii
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.36 2010/06/26 18:04:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.37 2010/08/29 10:58:46 xarthisius Exp $
+
+ 29 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> wmii-3.9.2-r1.ebuild:
+ Fix build with gmake 3.82 wrt bug 335083. Thanks to Diego for the report.
26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> wmii-3.9.2-r1.ebuild:
Respect AR, and avoid running sed.
diff --git a/x11-wm/wmii/wmii-3.9.2-r1.ebuild b/x11-wm/wmii/wmii-3.9.2-r1.ebuild
index 397fa3b697ea..00f8ebfe0911 100644
--- a/x11-wm/wmii/wmii-3.9.2-r1.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2-r1.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/x11-wm/wmii/wmii-3.9.2-r1.ebuild,v 1.2 2010/06/26 18:04:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2-r1.ebuild,v 1.3 2010/08/29 10:58:46 xarthisius Exp $
EAPI=2
inherit flag-o-matic multilib toolchain-funcs
@@ -47,6 +47,10 @@ pkg_setup() {
)
}
+src_prepare() {
+ sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
+}
+
src_compile() {
append-flags -I/usr/include/freetype2
emake "${mywmiiconf[@]}" || die