summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-02-07 11:31:39 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-02-07 11:31:39 +0000
commita5cb88d7188da87a6fad6059c68ab09caa806239 (patch)
treea4cd3c271e81b3a5959fd0d75048c73e644e8c4a /media-sound
parentversion bump - bug #401429 (diff)
downloadgentoo-2-a5cb88d7188da87a6fad6059c68ab09caa806239.tar.gz
gentoo-2-a5cb88d7188da87a6fad6059c68ab09caa806239.tar.bz2
gentoo-2-a5cb88d7188da87a6fad6059c68ab09caa806239.zip
Fix build failure due missing 'auto/' directory. Fixed build failure on native (non-cross) systems with windres binary. Approved by Chainsaw.
(Portage version: 2.2.0_alpha84_p53/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/schismtracker/ChangeLog7
-rw-r--r--media-sound/schismtracker/schismtracker-20120105.ebuild17
2 files changed, 22 insertions, 2 deletions
diff --git a/media-sound/schismtracker/ChangeLog b/media-sound/schismtracker/ChangeLog
index 102ea9f4cfc9..9a35f84ca5b1 100644
--- a/media-sound/schismtracker/ChangeLog
+++ b/media-sound/schismtracker/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/schismtracker
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/schismtracker/ChangeLog,v 1.6 2012/02/03 10:50:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/schismtracker/ChangeLog,v 1.7 2012/02/07 11:31:39 slyfox Exp $
+
+ 07 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org>
+ schismtracker-20120105.ebuild:
+ Fix build failure due missing 'auto/' directory. Fixed build failure on native
+ (non-cross) systems with windres binary. Approved by Chainsaw.
03 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
schismtracker-20110101.ebuild:
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
index 1a897bfd9020..87f7f9a7c94f 100644
--- a/media-sound/schismtracker/schismtracker-20120105.ebuild
+++ b/media-sound/schismtracker/schismtracker-20120105.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/schismtracker/schismtracker-20120105.ebuild,v 1.1 2012/02/03 10:46:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/schismtracker/schismtracker-20120105.ebuild,v 1.2 2012/02/07 11:31:39 slyfox Exp $
EAPI=4
inherit eutils
@@ -28,6 +28,21 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS NEWS README TODO"
+src_prepare() {
+ default
+
+ # workaround for temporary files (missing directory). Fixes:
+ # sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+ # /bin/sh: auto/default-font.c: No such file or directory
+ mkdir auto
+
+ # sys-devel/binutils[multitarget] provides ${CHOST}-windres
+ # wine provides /usr/bin/windres
+ # and schismtracker fails to use it properly:
+ # sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+ [[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
src_install() {
default