diff options
| author |   Andrew Clemons <andrew.clemons@gmail.com> | 2024-06-02 11:30:35 +0900 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-06-08 16:24:20 +0700 |
| commit | 094869d7359061ee0e751cd1ef47221b57c28064 (patch) | |
| tree | 0b3f2364558b167e2d7ac7933170bccdda1c1c82 | |
| parent | 84353e20ed8d27829cef65c96788cf3fbac3e660 (diff) | |
| download | slackbuilds-094869d7359061ee0e751cd1ef47221b57c28064.tar.gz slackbuilds-094869d7359061ee0e751cd1ef47221b57c28064.tar.xz | |
development/Bear: Fix 32bit build.
This was hard-coding the lib dir act lib64.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/Bear/Bear.SlackBuild | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/development/Bear/Bear.SlackBuild b/development/Bear/Bear.SlackBuild index 4b4b8eef89..1147c8ba06 100644 --- a/development/Bear/Bear.SlackBuild +++ b/development/Bear/Bear.SlackBuild @@ -50,13 +50,20 @@ PKG="$TMP/package-$PRGNAM" OUTPUT="${OUTPUT:-/tmp}" if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -76,13 +83,13 @@ cmake \ -DENABLE_UNIT_TESTS=OFF \ -DENABLE_FUNC_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=$INSTPREFIX \ - -DCMAKE_INSTALL_LIBDIR=lib64 \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_DOCDIR=doc/$NAMVER \ make all make DESTDIR="$PKG" install -# There is an insatll/strip Makefile recipe, but sbopkglint still compalins. +# There is an install/strip Makefile recipe, but sbopkglint still compalins. 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 |