1 |
commit: 1b99de510adbadfd03778f8cdf753ffd1b1e24db |
2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat May 27 21:05:20 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 2 06:56:49 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b99de51 |
7 |
|
8 |
games-sports/torcs: Fix building with GCC-6 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594670 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/4780 |
13 |
|
14 |
games-sports/torcs/files/torcs-1.3.6-gcc6.patch | 11 +++++++++++ |
15 |
games-sports/torcs/torcs-1.3.6-r1.ebuild | 3 ++- |
16 |
games-sports/torcs/torcs-1.3.6.ebuild | 5 +++-- |
17 |
3 files changed, 16 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..6daf22a81b1 |
22 |
--- /dev/null |
23 |
+++ b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch |
24 |
@@ -0,0 +1,11 @@ |
25 |
+--- a/src/drivers/olethros/geometry.cpp |
26 |
++++ b/src/drivers/olethros/geometry.cpp |
27 |
+@@ -27,6 +27,8 @@ |
28 |
+ #ifdef WIN32 |
29 |
+ #include <float.h> |
30 |
+ #define isnan _isnan |
31 |
++#elif __cplusplus >= 201103L |
32 |
++using std::isnan; |
33 |
+ #endif |
34 |
+ |
35 |
+ |
36 |
|
37 |
diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild b/games-sports/torcs/torcs-1.3.6-r1.ebuild |
38 |
index da2ecb7763b..c92083f6cbc 100644 |
39 |
--- a/games-sports/torcs/torcs-1.3.6-r1.ebuild |
40 |
+++ b/games-sports/torcs/torcs-1.3.6-r1.ebuild |
41 |
@@ -1,4 +1,4 @@ |
42 |
-# Copyright 1999-2016 Gentoo Foundation |
43 |
+# Copyright 1999-2017 Gentoo Foundation |
44 |
# Distributed under the terms of the GNU General Public License v2 |
45 |
|
46 |
EAPI=6 |
47 |
@@ -33,6 +33,7 @@ PATCHES=( |
48 |
"${FILESDIR}"/${P}-flags.patch |
49 |
"${FILESDIR}"/${P}-format.patch |
50 |
"${FILESDIR}"/${P}-noXmuXt.patch |
51 |
+ "${FILESDIR}"/${P}-gcc6.patch |
52 |
) |
53 |
|
54 |
src_prepare() { |
55 |
|
56 |
diff --git a/games-sports/torcs/torcs-1.3.6.ebuild b/games-sports/torcs/torcs-1.3.6.ebuild |
57 |
index e447c13937a..c3716983355 100644 |
58 |
--- a/games-sports/torcs/torcs-1.3.6.ebuild |
59 |
+++ b/games-sports/torcs/torcs-1.3.6.ebuild |
60 |
@@ -1,4 +1,4 @@ |
61 |
-# Copyright 1999-2015 Gentoo Foundation |
62 |
+# Copyright 1999-2017 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
|
65 |
EAPI=5 |
66 |
@@ -33,7 +33,8 @@ src_prepare() { |
67 |
"${FILESDIR}"/${P}-as-needed.patch \ |
68 |
"${FILESDIR}"/${P}-flags.patch \ |
69 |
"${FILESDIR}"/${P}-format.patch \ |
70 |
- "${FILESDIR}"/${P}-noXmuXt.patch |
71 |
+ "${FILESDIR}"/${P}-noXmuXt.patch \ |
72 |
+ "${FILESDIR}"/${P}-gcc6.patch |
73 |
eautoreconf |
74 |
ecvs_clean |
75 |
} |