diff options
Diffstat (limited to 'source/d/dev86/dev86.SlackBuild')
| -rwxr-xr-x | source/d/dev86/dev86.SlackBuild | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/source/d/dev86/dev86.SlackBuild b/source/d/dev86/dev86.SlackBuild index 5c4e1555..583e821c 100755 --- a/source/d/dev86/dev86.SlackBuild +++ b/source/d/dev86/dev86.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007-2008 Heinz Wiesinger <hmwiesinger@gmx.at> +# Copyright 2007, 2008, 2015 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -23,13 +23,13 @@ PRGNAM=dev86 SRCNAM=Dev86src -VERSION=0.16.17 -BUILD=${BUILD:-2} +VERSION=0.16.21 +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp} 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" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -55,35 +55,29 @@ else LIBDIRSUFFIX="" fi -set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvzf $CWD/$SRCNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -if [ "$ARCH" = "x86_64" ]; then - zcat $CWD/dev86-x86_64.patch.gz \ - | patch -p1 --verbose --backup --suffix=.orig -E - # On x86_64 elks will not build: - zcat $CWD/dev86-x86_64.noelks.patch.gz \ - | patch -p1 --verbose --backup --suffix=.orig -E -fi +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $PRGNAM-$VERSION || exit 1 chown -R root:root . -chmod -R u+w,go+r-w,a-s . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; #Does not compile with changed CFLAGS #CC="gcc" make CFLAGS="-Wall -Wstrict-prototypes $SLKCFLAGS -g" DIST=$PKG CC="gcc" \ -make DIST=$PKG MANDIR=/usr/man LIBDIR=/usr/lib${LIBDIRSUFFIX}/bcc \ +make \ + DIST=$PKG MANDIR=/usr/man LIBDIR=/usr/lib${LIBDIRSUFFIX}/bcc \ INCLDIR=/usr/lib${LIBDIRSUFFIX}/bcc LOCALPREFIX=/usr \ - install install-man + install install-man || exit 1 -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; @@ -95,7 +89,6 @@ cp -a Changes Contributors COPYING README $PKG/usr/doc/$PRGNAM-$VERSION for i in bootblocks copt dis88 elksemu unproto ; do cp -a $i/README $PKG/usr/doc/$PRGNAM-$VERSION/README.$i ; done -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -type f -exec chmod 0644 {} \; if [ "$ARCH" = "x86_64" ]; then # Remove traces of elks |