diff options
| author | Ábel Futó | 2020-05-31 20:56:43 +0200 |
|---|---|---|
| committer | Ábel Futó | 2020-05-31 20:56:43 +0200 |
| commit | 5564c15ab886003c1d5c5c6720f649b63c561f8a (patch) | |
| tree | 10aef83a4445272f38451b0c2b0fde24ae1775a9 | |
| parent | bba6af3f4ecb68fadf6ca2a60352cb46786171b8 (diff) | |
| download | aur-5564c15ab886003c1d5c5c6720f649b63c561f8a.tar.gz | |
Fix build with gcc 10
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | fix-gcc10-fnocommon.patch | 40 |
2 files changed, 44 insertions, 1 deletions
@@ -2,7 +2,7 @@ # Contributor: John Schug <xtr.xtrnet@gmail.com> pkgname=z88dk pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Developement kit for Z80 computers" arch=('i686' 'x86_64') url="http://z88dk.org" @@ -11,15 +11,18 @@ depends=('perl' 'libxml2') backup=(etc/profile.d/z88dk.sh) source=(http://downloads.sourceforge.net/project/z88dk/z88dk/${pkgver}/${pkgname}-src-${pkgver}.tgz fix-makefile-v2.0.patch + fix-gcc10-fnocommon.patch z88dk.sh) sha256sums=('285fb55858b3860fb7a152d6090eedd355a33863812d94ef56368825547d5506' '8a275f9240cbc89e7d7443cfe35875c3f1ffc2c57bd95375dee250d8031ba509' + 'e55d7d1f262429cedc478f87cadbbe1eff8c7a874c2d7bdc8019174e46a9c2ac' '4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156') prepare() { cd "${srcdir}/${pkgname}" patch -Np0 < ../fix-makefile-v2.0.patch + patch -Np1 < ../fix-gcc10-fnocommon.patch } diff --git a/fix-gcc10-fnocommon.patch b/fix-gcc10-fnocommon.patch new file mode 100644 index 000000000000..005732b89cc0 --- /dev/null +++ b/fix-gcc10-fnocommon.patch @@ -0,0 +1,40 @@ +diff -Naur z88dk.old/src/appmake/m5.c z88dk/src/appmake/m5.c +--- z88dk.old/src/appmake/m5.c 2018-09-17 05:00:12.000000000 +0200 ++++ z88dk/src/appmake/m5.c 2020-05-31 14:52:29.889764807 +0200 +@@ -15,7 +15,6 @@ + static char help = 0; + static char audio = 0; + static char fast = 0; +-unsigned long checksum; + + + /* Options that are available for this module */ +@@ -83,6 +82,7 @@ + int c; + int i; + int len, blocklen; ++ unsigned long checksum; + + if (help) + return -1; +diff -Naur z88dk.old/src/appmake/sc3000.c z88dk/src/appmake/sc3000.c +--- z88dk.old/src/appmake/sc3000.c 2019-06-12 05:00:08.000000000 +0200 ++++ z88dk/src/appmake/sc3000.c 2020-05-31 14:51:58.861726767 +0200 +@@ -21,8 +21,6 @@ + static char survivors = 0; + static char sf7000 = 0; + +-unsigned long checksum; +- + + /* Options that are available for this module */ + option_t sc3000_options[] = { +@@ -112,6 +110,8 @@ + FILE *fpin, *fpout; + long pos=0, blocklen; + int c, i, len; ++ unsigned long checksum; ++ + + if (help) + return -1; |