From 07da2a35708ff45bd8b39bb272895c063b70c003 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 17 Apr 2022 12:17:43 -0400 Subject: [PATCH] libraries/liborigin: Fix docs. Signed-off-by: B. Watson --- libraries/liborigin/liborigin.SlackBuild | 25 +++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libraries/liborigin/liborigin.SlackBuild b/libraries/liborigin/liborigin.SlackBuild index 4964b3a336..88dd8e29c5 100644 --- a/libraries/liborigin/liborigin.SlackBuild +++ b/libraries/liborigin/liborigin.SlackBuild @@ -4,25 +4,26 @@ # Written by Daniil Bratashov (dn2010@gmail.com) +# 20220417 bkw: Modified by SlackBuilds.org, BUILD=2: +# - do not create /usr/doc/$PRGNAM symlink. +# - i486 => i586. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=liborigin VERSION=${VERSION:-2.0.0} -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 @@ -32,8 +33,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" @@ -57,9 +58,9 @@ cd $PRGNAM 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 {} \+ mkdir -p build cd build @@ -72,12 +73,9 @@ cd build -DCMAKE_BUILD_TYPE=Release \ -DBoost_LIBRARY_DIRS=/usr/lib64 make - make install DESTDIR=$PKG + make install/strip DESTDIR=$PKG cd .. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - # libdir is hardcoded in various places if [ "$LIBDIRSUFFIX" = "64" ]; then mv $PKG/usr/lib $PKG/usr/lib64 @@ -89,7 +87,6 @@ rm $PKG/usr/lib${LIBDIRSUFFIX}/liborigin.a mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM ) rm -rf $PKG/usr/share mkdir -p $PKG/install