diff options
| -rw-r--r-- | games/chocolate-doom/chocolate-doom.SlackBuild | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild index 66c57cc852..a7df38647c 100644 --- a/games/chocolate-doom/chocolate-doom.SlackBuild +++ b/games/chocolate-doom/chocolate-doom.SlackBuild @@ -6,6 +6,9 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20250810 bkw: BUILD=2: -std=c17, fixes -current build. Thanks to pomfland +# for pointing this out. + # 20240805 bkw: update for v3.1.0. # 20210727 bkw: fix build on -current (does no harm on 14.2), BUILD=2. # 20201019 bkw: update for v3.0.1. @@ -29,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=chocolate-doom VERSION=${VERSION:-3.1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,8 +85,8 @@ rm -rf $PRGNAM-$REALVER $PRGNAM-$PRGNAM-$REALVER tar xvf $CWD/$PRGNAM-$REALVER.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$REALVER.tar.gz cd $PRGNAM-$REALVER || cd $PRGNAM-$PRGNAM-$REALVER chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + # upstream fix from git, easier to use sed than make a diff. # as of 3.1.0, this line doesn't do anything, leaving it in case someone @@ -94,8 +97,7 @@ sed -i '/^boolean demoextend/d' src/hexen/mn_menu.c # NB: Upstream uses --docdir in a weird way: docs for chocolate-doom # go in $docdir, the others go in e.g. "$docdir/../chocolate-hexen/". -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=c17" \ ./configure \ --bindir=/usr/games \ --prefix=/usr \ @@ -106,7 +108,8 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION/$PRGNAM \ --build=$ARCH-slackware-linux -make +# 20250810 bkw: verbose make (to make sure SLKCFLAGS is used correctly) +make V=1 make install-strip DESTDIR=$PKG # No symlinks in /usr/man. |