games/maelstrom: Fix build on -current.
Signed-off-by: B. Watson <yalhcru@gmail.com>
This commit is contained in:
parent
e27dc891e2
commit
f36f43ed41
|
@ -6,6 +6,8 @@
|
||||||
|
|
||||||
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
|
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
|
||||||
|
|
||||||
|
# 20180627 bkw: fix compile with gcc 8 (for -current).
|
||||||
|
|
||||||
# 20160730 bkw:
|
# 20160730 bkw:
|
||||||
# - Fix compile with gcc 5 (for Slack 14.2). Also fix some
|
# - Fix compile with gcc 5 (for Slack 14.2). Also fix some
|
||||||
# compiler warnings while I'm at it.
|
# compiler warnings while I'm at it.
|
||||||
|
@ -57,9 +59,9 @@ cd $SRCNAM-$VERSION
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
find -L . \
|
find -L . \
|
||||||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||||
-o -perm 511 \) -exec chmod 755 {} \; -o \
|
-o -perm 511 \) -exec chmod 755 {} \+ -o \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
|
||||||
|
|
||||||
# Fix 64-bit compile issue (not needed on 32-bit, but does no harm)
|
# Fix 64-bit compile issue (not needed on 32-bit, but does no harm)
|
||||||
patch -p1 < $CWD/compile_fix.diff
|
patch -p1 < $CWD/compile_fix.diff
|
||||||
|
@ -68,6 +70,11 @@ patch -p1 < $CWD/compile_fix.diff
|
||||||
# (also make `make install' support DESTDIR properly!)
|
# (also make `make install' support DESTDIR properly!)
|
||||||
patch -p1 < $CWD/install_dirs.diff
|
patch -p1 < $CWD/install_dirs.diff
|
||||||
|
|
||||||
|
# 20180627 bkw: It seems structs and typedefs now share a namespace
|
||||||
|
# in gcc-8.1's g++. So rename this struct to keep the compiler happy
|
||||||
|
# on -current (and it does no harm on 14.2 either):
|
||||||
|
sed -i 's,struct *button,struct b_utton,g' buttonlist.h
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
|
Loading…
Reference in New Issue