diff options
| author |   B. Watson | 2022-02-22 19:17:32 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-02-23 14:10:23 +0100 |
| commit | 569ce0533866cff1a12e2a59051b29f288a85c64 (patch) | |
| tree | be15c2eadf3ad5ead58407189733c64d845b2a16 | |
| parent | 97f3b9e21fb2fc3fda5c3fa81dc2c1184b55c1b5 (diff) | |
| download | slackbuilds-569ce0533866cff1a12e2a59051b29f288a85c64.tar.gz | |
games/rocksndiamonds: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | games/rocksndiamonds/rocksndiamonds.SlackBuild | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/games/rocksndiamonds/rocksndiamonds.SlackBuild b/games/rocksndiamonds/rocksndiamonds.SlackBuild index db1bee0ea5..3b35d152c6 100644 --- a/games/rocksndiamonds/rocksndiamonds.SlackBuild +++ b/games/rocksndiamonds/rocksndiamonds.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rocksndiamonds @@ -32,15 +34,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,8 +49,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then @@ -71,13 +70,13 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ make clean make \ - EXTRA_CFLAGS="$SLKCFLAGS -fgnu89-inline" \ + EXTRA_CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" \ RO_GAME_DIR=/usr/games \ RO_GAME_DIR=/usr/share/games/rocksndiamonds \ RW_GAME_DIR=/var/games/rocksndiamonds \ @@ -100,7 +99,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - docs ChangeLog COPYING CREDITS INSTALL README \ + docs ChangeLog COPYING CREDITS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |