| 1 |
commit: 4e5742588f96ac9bdfbf6416baa8b8f851f9ddf0 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 14 12:34:34 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 14 12:34:34 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e574258 |
| 7 |
|
| 8 |
sci-electronics/Stage: Add patch to build with gcc6, bug #596434, patch by Peter Levine |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
sci-electronics/Stage/Stage-4.1.1.ebuild | 3 +- |
| 13 |
sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch | 95 ++++++++++++++++++++++ |
| 14 |
2 files changed, 97 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/sci-electronics/Stage/Stage-4.1.1.ebuild b/sci-electronics/Stage/Stage-4.1.1.ebuild |
| 17 |
index d9bd408..1034e5b 100644 |
| 18 |
--- a/sci-electronics/Stage/Stage-4.1.1.ebuild |
| 19 |
+++ b/sci-electronics/Stage/Stage-4.1.1.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2015 Gentoo Foundation |
| 22 |
+# Copyright 1999-2016 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
@@ -36,3 +36,4 @@ RDEPEND=" |
| 27 |
" |
| 28 |
DEPEND="${RDEPEND} |
| 29 |
virtual/pkgconfig" |
| 30 |
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" ) |
| 31 |
|
| 32 |
diff --git a/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch b/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000..9124baa |
| 35 |
--- /dev/null |
| 36 |
+++ b/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch |
| 37 |
@@ -0,0 +1,95 @@ |
| 38 |
+https://bugs.gentoo.org/show_bug.cgi?id=596434 |
| 39 |
+Author: Peter Levine |
| 40 |
+ |
| 41 |
+--- Stage-4.1.1/libstage/stage.hh.old 2016-10-12 01:12:18.828436085 -0400 |
| 42 |
++++ Stage-4.1.1/libstage/stage.hh 2016-10-12 01:12:36.675465633 -0400 |
| 43 |
+@@ -622,46 +622,46 @@ |
| 44 |
+ { cont.erase( std::remove( cont.begin(), cont.end(), thing ), cont.end() ); } |
| 45 |
+ |
| 46 |
+ // Error macros - output goes to stderr |
| 47 |
+-#define PRINT_ERR(m) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", __FILE__, __FUNCTION__) |
| 48 |
+-#define PRINT_ERR1(m,a) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 49 |
+-#define PRINT_ERR2(m,a,b) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 50 |
+-#define PRINT_ERR3(m,a,b,c) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 51 |
+-#define PRINT_ERR4(m,a,b,c,d) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__) |
| 52 |
+-#define PRINT_ERR5(m,a,b,c,d,e) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__) |
| 53 |
++#define PRINT_ERR(m) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", __FILE__, __FUNCTION__) |
| 54 |
++#define PRINT_ERR1(m,a) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 55 |
++#define PRINT_ERR2(m,a,b) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 56 |
++#define PRINT_ERR3(m,a,b,c) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 57 |
++#define PRINT_ERR4(m,a,b,c,d) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__) |
| 58 |
++#define PRINT_ERR5(m,a,b,c,d,e) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__) |
| 59 |
+ |
| 60 |
+ // Warning macros |
| 61 |
+-#define PRINT_WARN(m) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", __FILE__, __FUNCTION__) |
| 62 |
+-#define PRINT_WARN1(m,a) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 63 |
+-#define PRINT_WARN2(m,a,b) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 64 |
+-#define PRINT_WARN3(m,a,b,c) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 65 |
+-#define PRINT_WARN4(m,a,b,c,d) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__) |
| 66 |
+-#define PRINT_WARN5(m,a,b,c,d,e) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__) |
| 67 |
++#define PRINT_WARN(m) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", __FILE__, __FUNCTION__) |
| 68 |
++#define PRINT_WARN1(m,a) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 69 |
++#define PRINT_WARN2(m,a,b) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 70 |
++#define PRINT_WARN3(m,a,b,c) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 71 |
++#define PRINT_WARN4(m,a,b,c,d) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__) |
| 72 |
++#define PRINT_WARN5(m,a,b,c,d,e) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__) |
| 73 |
+ |
| 74 |
+ // Message macros |
| 75 |
+ #ifdef DEBUG |
| 76 |
+-#define PRINT_MSG(m) printf( "Stage: "m" (%s %s)\n", __FILE__, __FUNCTION__) |
| 77 |
+-#define PRINT_MSG1(m,a) printf( "Stage: "m" (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 78 |
+-#define PRINT_MSG2(m,a,b) printf( "Stage: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 79 |
+-#define PRINT_MSG3(m,a,b,c) printf( "Stage: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 80 |
+-#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__) |
| 81 |
+-#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: "m" (%s %s)\n", a, b, c, d, e,__FILE__, __FUNCTION__) |
| 82 |
++#define PRINT_MSG(m) printf( "Stage: " m " (%s %s)\n", __FILE__, __FUNCTION__) |
| 83 |
++#define PRINT_MSG1(m,a) printf( "Stage: " m " (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 84 |
++#define PRINT_MSG2(m,a,b) printf( "Stage: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 85 |
++#define PRINT_MSG3(m,a,b,c) printf( "Stage: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 86 |
++#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__) |
| 87 |
++#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: " m " (%s %s)\n", a, b, c, d, e,__FILE__, __FUNCTION__) |
| 88 |
+ #else |
| 89 |
+-#define PRINT_MSG(m) printf( "Stage: "m"\n" ) |
| 90 |
+-#define PRINT_MSG1(m,a) printf( "Stage: "m"\n", a) |
| 91 |
+-#define PRINT_MSG2(m,a,b) printf( "Stage: "m"\n,", a, b ) |
| 92 |
+-#define PRINT_MSG3(m,a,b,c) printf( "Stage: "m"\n", a, b, c ) |
| 93 |
+-#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: "m"\n", a, b, c, d ) |
| 94 |
+-#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: "m"\n", a, b, c, d, e ) |
| 95 |
++#define PRINT_MSG(m) printf( "Stage: " m "\n" ) |
| 96 |
++#define PRINT_MSG1(m,a) printf( "Stage: " m "\n", a) |
| 97 |
++#define PRINT_MSG2(m,a,b) printf( "Stage: " m "\n,", a, b ) |
| 98 |
++#define PRINT_MSG3(m,a,b,c) printf( "Stage: " m "\n", a, b, c ) |
| 99 |
++#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: " m "\n", a, b, c, d ) |
| 100 |
++#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: " m "\n", a, b, c, d, e ) |
| 101 |
+ #endif |
| 102 |
+ |
| 103 |
+ // DEBUG macros |
| 104 |
+ #ifdef DEBUG |
| 105 |
+-#define PRINT_DEBUG(m) printf( "debug: "m" (%s %s)\n", __FILE__, __FUNCTION__) |
| 106 |
+-#define PRINT_DEBUG1(m,a) printf( "debug: "m" (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 107 |
+-#define PRINT_DEBUG2(m,a,b) printf( "debug: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 108 |
+-#define PRINT_DEBUG3(m,a,b,c) printf( "debug: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 109 |
+-#define PRINT_DEBUG4(m,a,b,c,d) printf( "debug: "m" (%s %s)\n", a, b, c ,d, __FILE__, __FUNCTION__) |
| 110 |
+-#define PRINT_DEBUG5(m,a,b,c,d,e) printf( "debug: "m" (%s %s)\n", a, b, c ,d, e, __FILE__, __FUNCTION__) |
| 111 |
++#define PRINT_DEBUG(m) printf( "debug: " m " (%s %s)\n", __FILE__, __FUNCTION__) |
| 112 |
++#define PRINT_DEBUG1(m,a) printf( "debug: " m " (%s %s)\n", a, __FILE__, __FUNCTION__) |
| 113 |
++#define PRINT_DEBUG2(m,a,b) printf( "debug: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) |
| 114 |
++#define PRINT_DEBUG3(m,a,b,c) printf( "debug: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__) |
| 115 |
++#define PRINT_DEBUG4(m,a,b,c,d) printf( "debug: " m " (%s %s)\n", a, b, c ,d, __FILE__, __FUNCTION__) |
| 116 |
++#define PRINT_DEBUG5(m,a,b,c,d,e) printf( "debug: " m " (%s %s)\n", a, b, c ,d, e, __FILE__, __FUNCTION__) |
| 117 |
+ #else |
| 118 |
+ #define PRINT_DEBUG(m) |
| 119 |
+ #define PRINT_DEBUG1(m,a) |
| 120 |
+--- Stage-4.1.1/libstage/world.cc.old 2016-10-12 01:17:16.689055842 -0400 |
| 121 |
++++ Stage-4.1.1/libstage/world.cc 2016-10-12 01:17:22.039117546 -0400 |
| 122 |
+@@ -803,8 +803,8 @@ |
| 123 |
+ // Graphics Gems IV |
| 124 |
+ const int32_t sx(sgn(dx)); |
| 125 |
+ const int32_t sy(sgn(dy)); |
| 126 |
+- const int32_t ax(abs(dx)); |
| 127 |
+- const int32_t ay(abs(dy)); |
| 128 |
++ const int32_t ax(std::abs(dx)); |
| 129 |
++ const int32_t ay(std::abs(dy)); |
| 130 |
+ const int32_t bx(2*ax); |
| 131 |
+ const int32_t by(2*ay); |
| 132 |
+ int32_t exy(ay-ax); // difference between x and y distances |
Archives