| 1 |
commit: 9ab22c6131945c53dedb9ff31d0cae13a5583ecb |
| 2 |
Author: Marty Plummer <ntzrmtthihu777 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jun 7 00:25:32 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 12 17:43:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab22c61 |
| 7 |
|
| 8 |
dev-util/mingw64-runtime: fix build with USE="tools" with gcc7 |
| 9 |
|
| 10 |
Included patch only changes code formatting and comments. See: |
| 11 |
https://sourceforge.net/p/mingw-w64/bugs/616/ |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/4878 |
| 15 |
|
| 16 |
...ingw64-runtime-5.0.2-implicit-fallthrough.patch | 41 ++++++++++++++++++++++ |
| 17 |
.../mingw64-runtime-5.0.2-r1.ebuild | 1 + |
| 18 |
2 files changed, 42 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..859e00243d3 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch |
| 25 |
@@ -0,0 +1,41 @@ |
| 26 |
+diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c |
| 27 |
+index a935abfe..cefdd8cb 100644 |
| 28 |
+--- a/mingw-w64-tools/gendef/src/gendef.c |
| 29 |
++++ b/mingw-w64-tools/gendef/src/gendef.c |
| 30 |
+@@ -1031,13 +1031,16 @@ redo_switch: |
| 31 |
+ PRDEBUG(" 0x%x illegal ", (unsigned int) b); |
| 32 |
+ #endif |
| 33 |
+ *aCode=c_ill; return 0; |
| 34 |
+- case c_4: sz++; |
| 35 |
+- case c_3: sz++; |
| 36 |
+- case c_lb: |
| 37 |
+- case c_2: sz++; |
| 38 |
+- case c_retn: case c_retf: |
| 39 |
+- case c_iret: case c_int3: |
| 40 |
+- case c_ad: case c_op: |
| 41 |
++ case c_4: sz++; // fallthrough |
| 42 |
++ case c_3: sz++; // fallthrough |
| 43 |
++ case c_lb: // fallthrough |
| 44 |
++ case c_2: sz++; // fallthrough |
| 45 |
++ case c_retn: // fallthrough |
| 46 |
++ case c_retf: // fallthrough |
| 47 |
++ case c_iret: // fallthrough |
| 48 |
++ case c_int3: // fallthrough |
| 49 |
++ case c_ad: // fallthrough |
| 50 |
++ case c_op: // fallthrough |
| 51 |
+ case c_1: *aCode=tb1; return sz; |
| 52 |
+ case c_lv: |
| 53 |
+ if (oper_mode) sz+=4; |
| 54 |
+diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c |
| 55 |
+index b2430bbc..6a37b1a0 100644 |
| 56 |
+--- a/mingw-w64-tools/genpeimg/src/genpeimg.c |
| 57 |
++++ b/mingw-w64-tools/genpeimg/src/genpeimg.c |
| 58 |
+@@ -203,7 +203,7 @@ pass_args (int argc, char **argv) |
| 59 |
+ goto error_point; |
| 60 |
+ case 'h': |
| 61 |
+ if (h[2] == 0) |
| 62 |
+- show_usage (); |
| 63 |
++ show_usage (); // fallthrough |
| 64 |
+ default: |
| 65 |
+ error_point: |
| 66 |
+ fprintf (stderr, "Unknown option ,%s'\n", h); |
| 67 |
|
| 68 |
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild |
| 69 |
index e37ad32d072..534091fe654 100644 |
| 70 |
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild |
| 71 |
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild |
| 72 |
@@ -30,6 +30,7 @@ S="${WORKDIR}/mingw-w64-v${PV}" |
| 73 |
PATCHES=( |
| 74 |
"${FILESDIR}/${PN}-4.0.1-winpthreads.patch" |
| 75 |
"${FILESDIR}/${PN}-4.0.1-build.patch" |
| 76 |
+ "${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch" |
| 77 |
) |
| 78 |
|
| 79 |
is_crosscompile() { |
Archives