diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-04-08 03:01:39 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-04-09 15:45:10 +0700 |
| commit | ba6030e8958e917acd725fdfc79cdaa72846406d (patch) | |
| tree | 51292cb714a40c1b856577bc3d742e49f9814cbb | |
| parent | d4fffebf9139c9ec8cc46078902b7964b7c83acf (diff) | |
misc/ardesia: Remove /usr/share/doc, don't write to /root.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | misc/ardesia/ardesia.SlackBuild | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/misc/ardesia/ardesia.SlackBuild b/misc/ardesia/ardesia.SlackBuild index d7df0640c17f..9bd0db1aa62b 100644 --- a/misc/ardesia/ardesia.SlackBuild +++ b/misc/ardesia/ardesia.SlackBuild @@ -6,25 +6,27 @@ # Public Domain +# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2: +# - i486 => i586. +# - remove /usr/share/doc. +# - do not litter /root/ with desktop-ey files during the build. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ardesia VERSION=${VERSION:-1.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} 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 @@ -34,8 +36,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" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -61,9 +63,16 @@ patch -p1 < $CWD/010-ardesia-gcc10-fix.patch 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 \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -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 {} \+ + +# 20220408 bkw: this thing creates too many files in /root/.local, +# /root/.config, /root/.gnome... setting HOME fixes it, but would break +# ccache if it's in use, so: +mkdir -p .tmphome +export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache} +export HOME=$( pwd )/.tmphome CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -83,10 +92,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +rm -rf $PKG/usr/share/doc + # --docdir is not respected and does not install all of the standard document files # Alternate Fail safe to the standard. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |