summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchala2017-06-06 20:02:24 -0700
committerSchala2017-06-06 20:02:24 -0700
commit40edc566403a4a75b0163a386ebe75ffb8cb07ab (patch)
treef9c48733d64d263c0b878ef7d5b5b9ba64dcd6fe
parent5d3ad89532fc22a9a15368f7acc6ae63e2157ce0 (diff)
downloadaur-40edc566403a4a75b0163a386ebe75ffb8cb07ab.tar.gz
gcc7 patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
-rw-r--r--patch.txt41
3 files changed, 55 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 11b7551358f..6f554962156 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jun 4 02:19:20 UTC 2017
+# Wed Jun 7 03:02:10 UTC 2017
pkgbase = mingw-w64-tools
pkgdesc = MinGW-w64 utilities
pkgver = 5.0.2
- pkgrel = 1
+ pkgrel = 2
url = http://mingw-w64.sourceforge.net
arch = i686
arch = x86_64
@@ -13,7 +13,9 @@ pkgbase = mingw-w64-tools
options = !libtool
options = !emptydirs
source = http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v5.0.2.tar.bz2
+ source = patch.txt
md5sums = 80d6884c9da234e73054347f44158b8a
+ md5sums = 9f5edb073b656a82c5672680935d1e51
pkgname = mingw-w64-tools
diff --git a/PKGBUILD b/PKGBUILD
index 1479f640fdc..414cda9273c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,27 @@
pkgname=mingw-w64-tools
pkgver=5.0.2
_pkgver=${pkgver/rc/-rc}
-pkgrel=1
+pkgrel=2
pkgdesc="MinGW-w64 utilities"
arch=(i686 x86_64)
url="http://mingw-w64.sourceforge.net"
license=("GPL3" "LGPL2")
groups=(mingw-w64)
options=(!libtool !emptydirs)
-source=("http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2")
-md5sums=('80d6884c9da234e73054347f44158b8a')
+source=("http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2"
+"patch.txt")
+md5sums=('80d6884c9da234e73054347f44158b8a'
+ '9f5edb073b656a82c5672680935d1e51')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+prepare() {
+ cd "${srcdir}"/mingw-w64-v${_pkgver}
+ patch -p1 -i "${srcdir}"/patch.txt
+}
+
build() {
cd "${srcdir}"
- CFLAGS="-Wno-error $CFLAGS"
- CXXFLAGS="-Wno-error $CXXFLAGS"
mkdir -p "${srcdir}"/gendef-build && cd "${srcdir}"/gendef-build
"${srcdir}"/mingw-w64-v${_pkgver}/mingw-w64-tools/gendef/configure --prefix=/usr
make
diff --git a/patch.txt b/patch.txt
new file mode 100644
index 00000000000..859e00243d3
--- /dev/null
+++ b/patch.txt
@@ -0,0 +1,41 @@
+diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
+index a935abfe..cefdd8cb 100644
+--- a/mingw-w64-tools/gendef/src/gendef.c
++++ b/mingw-w64-tools/gendef/src/gendef.c
+@@ -1031,13 +1031,16 @@ redo_switch:
+ PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+ *aCode=c_ill; return 0;
+- case c_4: sz++;
+- case c_3: sz++;
+- case c_lb:
+- case c_2: sz++;
+- case c_retn: case c_retf:
+- case c_iret: case c_int3:
+- case c_ad: case c_op:
++ case c_4: sz++; // fallthrough
++ case c_3: sz++; // fallthrough
++ case c_lb: // fallthrough
++ case c_2: sz++; // fallthrough
++ case c_retn: // fallthrough
++ case c_retf: // fallthrough
++ case c_iret: // fallthrough
++ case c_int3: // fallthrough
++ case c_ad: // fallthrough
++ case c_op: // fallthrough
+ case c_1: *aCode=tb1; return sz;
+ case c_lv:
+ if (oper_mode) sz+=4;
+diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
+index b2430bbc..6a37b1a0 100644
+--- a/mingw-w64-tools/genpeimg/src/genpeimg.c
++++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
+@@ -203,7 +203,7 @@ pass_args (int argc, char **argv)
+ goto error_point;
+ case 'h':
+ if (h[2] == 0)
+- show_usage ();
++ show_usage (); // fallthrough
+ default:
+ error_point:
+ fprintf (stderr, "Unknown option ,%s'\n", h);