From 82e4103f4e602d08f339dc76976abf28e391f9d2 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 14 Feb 2022 22:10:30 -0500 Subject: libraries/assimp: Fix cmake support for 64-bit. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- libraries/assimp/assimp.SlackBuild | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libraries/assimp/assimp.SlackBuild b/libraries/assimp/assimp.SlackBuild index 52a6939756..7186c96a5e 100644 --- a/libraries/assimp/assimp.SlackBuild +++ b/libraries/assimp/assimp.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=assimp VERSION=${VERSION:-5.0.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then 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 @@ -75,9 +72,9 @@ 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 \ + -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 {} \+ mkdir -p build cd build @@ -95,8 +92,14 @@ 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 +# 20220214 bkw: fix broken cmake support on x86_64. this was causing +# ogre to fail to build (and probably other stuff that uses this). +[ -n "$LIBDIRSUFFIX" ] && \ + sed -i "s,\\,lib$LIBDIRSUFFIX,g" \ + $PKG/usr/lib$LIBDIRSUFFIX/cmake/$PRGNAM-*/* + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES CREDITS INSTALL LICENSE README *.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES CREDITS LICENSE README *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -- cgit v1.2.3