summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfelix2017-08-01 17:54:09 +0200
committerfelix2017-08-01 17:54:30 +0200
commit21b4d68010d0d1a394bc9498b68affd16f924523 (patch)
treea83fdeed6f16d219b87dd0f90b5eb7b1a6bb386c
parentaa4fdd92d2915feb962f8f168f04a8e13eb57856 (diff)
downloadaur-21b4d68010d0d1a394bc9498b68affd16f924523.tar.gz
Fix build failure with latest gperf
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
-rw-r--r--in_word_set.patch26
3 files changed, 35 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 029c3f18010..ca34c380997 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,9 @@ pkgbase = flasm
makedepends = gperf
depends = zlib
source = http://www.nowrap.de/download/flasm16src.zip
+ source = in_word_set.patch
sha512sums = af53c8902bac9bc03a4274f51280abe7e595f19d8ee367c0237868634df58a42144bb6c335a99f860c494da90d483072c66064897ef1ad467b7621c648ca322a
+ sha512sums = f8b1c4c8407ceadf2727fb9217af032983cfe298f4a7c898267180285b7c8f7caff35b2a50e0e355b88fbf3d4d68f5142f78d98dfa39bcbcd4c4f6d16cbfd97f
pkgname = flasm
diff --git a/PKGBUILD b/PKGBUILD
index 3346b780584..8f34fa8a571 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,20 @@ license=(custom:BSD)
url='http://flasm.sourceforge.net/'
source=(
http://www.nowrap.de/download/flasm16src.zip
+ in_word_set.patch
)
depends=(zlib)
makedepends=(gperf)
sha512sums=(
'af53c8902bac9bc03a4274f51280abe7e595f19d8ee367c0237868634df58a42144bb6c335a99f860c494da90d483072c66064897ef1ad467b7621c648ca322a'
+ 'f8b1c4c8407ceadf2727fb9217af032983cfe298f4a7c898267180285b7c8f7caff35b2a50e0e355b88fbf3d4d68f5142f78d98dfa39bcbcd4c4f6d16cbfd97f'
)
+prepare() {
+ cd "$srcdir"
+ patch -Np1 < in_word_set.patch
+}
+
build() {
cd "$srcdir"
make
diff --git a/in_word_set.patch b/in_word_set.patch
new file mode 100644
index 00000000000..6a127ef076b
--- /dev/null
+++ b/in_word_set.patch
@@ -0,0 +1,26 @@
+Index: flasm/src/keywords.gperf
+===================================================================
+--- src/keywords.gperf
++++ src/keywords.gperf
+@@ -11,7 +11,7 @@ All rights reserved. See LICENSE.TXT for
+ #ifdef MEMWATCH
+ #include "memwatch.h"
+ #endif
+-struct keyword *in_word_set(register const char *str, register unsigned int len);
++struct keyword *in_word_set(register const char *str, register size_t len);
+ %}
+ struct keyword {}
+ %%
+Index: flasm/src/util.h
+===================================================================
+--- src/util.h
++++ src/util.h
+@@ -47,7 +47,7 @@ struct keyword {
+ int token;
+ };
+
+-extern struct keyword *in_word_set(register const char *str, register unsigned int len);
++extern struct keyword *in_word_set(register const char *str, register size_t len);
+
+ void checkByteOrder(void);
+ int longintCompare(const void *ap, const void *bp);