diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-11 04:03:09 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-12 13:32:51 +0700 |
| commit | 8792563e0a041f97c0e0611223b73d5f76bdf630 (patch) | |
| tree | 6c37e17154c8f5bb62ff08d457e212aa11b93bc4 /system/hwloc | |
| parent | d2010f7b96b86520e435beed898ddc05c8263e1a (diff) | |
system/hwloc: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/hwloc')
| -rw-r--r-- | system/hwloc/hwloc.SlackBuild | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/system/hwloc/hwloc.SlackBuild b/system/hwloc/hwloc.SlackBuild index 06966b76a91a..86f5bb8df52d 100644 --- a/system/hwloc/hwloc.SlackBuild +++ b/system/hwloc/hwloc.SlackBuild @@ -4,6 +4,8 @@ # Written by Wainamoinen <wainamoinen@gmail.com> +# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hwloc @@ -14,15 +16,12 @@ 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 +31,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,10 +56,11 @@ 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 {} \+ +SLKCFLAGS+=" -fcommon" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -75,10 +75,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-netloc make -make install DESTDIR=$PKG - -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 +make install-strip DESTDIR=$PKG +rm -f $PKG/usr/lib*/*.la 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 |