summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2012-09-24 14:58:07 +0000
committerAlex Alexander <wired@gentoo.org>2012-09-24 14:58:07 +0000
commitb2a7b9977aceb8a352a45afbfbaee2c0e1a62de9 (patch)
tree20d20c3e57248825575a092b780390e5db4c06a0 /games-util
parentAdding mips keyword (diff)
downloadgentoo-2-b2a7b9977aceb8a352a45afbfbaee2c0e1a62de9.tar.gz
gentoo-2-b2a7b9977aceb8a352a45afbfbaee2c0e1a62de9.tar.bz2
gentoo-2-b2a7b9977aceb8a352a45afbfbaee2c0e1a62de9.zip
pthreads build fix, bug #423305
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'games-util')
-rw-r--r--games-util/gtkevemon/ChangeLog6
-rw-r--r--games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch32
-rw-r--r--games-util/gtkevemon/gtkevemon-1.8-r1.ebuild4
3 files changed, 40 insertions, 2 deletions
diff --git a/games-util/gtkevemon/ChangeLog b/games-util/gtkevemon/ChangeLog
index dcc235f84c9e..56a85a527fb0 100644
--- a/games-util/gtkevemon/ChangeLog
+++ b/games-util/gtkevemon/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/gtkevemon
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/gtkevemon/ChangeLog,v 1.3 2012/05/03 03:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/gtkevemon/ChangeLog,v 1.4 2012/09/24 14:58:07 wired Exp $
+
+ 24 Sep 2012; Alex Alexander <wired@gentoo.org> gtkevemon-1.8-r1.ebuild,
+ +files/gtkevemon-1.8-pthreads-build-fix.patch:
+ pthreads build fix, bug #423305
03 May 2012; Jeff Horelick <jdhore@gentoo.org> gtkevemon-1.8-r1.ebuild,
gtkevemon-9999.ebuild:
diff --git a/games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch b/games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch
new file mode 100644
index 000000000000..3250680c7aa1
--- /dev/null
+++ b/games-util/gtkevemon/files/gtkevemon-1.8-pthreads-build-fix.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423305
+https://bitbucket.org/BattleClinic/gtkevemon/changeset/4c365033418e
+
+# HG changeset patch
+# User ChickenMan <chickenman@exhale.de>
+# Date 1341445681 -7200
+# Node ID 4c365033418e2213caff57a0917851cc18c7f1a1
+# Parent 0b8a490b5f491bdd4a36d85918479595c861d3db
+Fix compilation on systems using pthreads and gcc 4.7.x
+
+This fixes issue 1.
+Thanks to l0ser140 for reporting and initial patch.
+
+--- src/thread.h
++++ src/thread.h
+@@ -13,7 +13,15 @@
+ #ifndef THREAD_HEADER
+ #define THREAD_HEADER
+
+-#if defined(_POSIX_THREADS) || defined(__SunOS)
++#if defined(__linux__) \
++ || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) \
++ || defined(__DragonFly__) \
++ || defined(__APPLE__) \
++ || defined(__SunOS)
++# include <unistd.h> // for _POSIX_THREADS
++#endif
++
++#if defined(_POSIX_THREADS)
+ # include "thread_posix.h"
+ #elif defined(WIN32)
+ # include "thread_win32.h"
diff --git a/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild b/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
index f3895b1981cf..d58490ae5aab 100644
--- a/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
+++ b/games-util/gtkevemon/gtkevemon-1.8-r1.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/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild,v 1.3 2012/05/03 03:41:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild,v 1.4 2012/09/24 14:58:07 wired Exp $
EAPI=4
@@ -40,6 +40,8 @@ src_prepare() {
epatch "${FILESDIR}/${P}-portrait.patch"
# upstream fix for remap calculation after learning skills removal
epatch "${DISTDIR}/${P}-learning.patch.gz"
+ # pthreads build fix, bug #423305
+ epatch "${FILESDIR}/${P}-pthreads-build-fix.patch"
}
src_install() {