diff options
| author |   B. Watson | 2022-02-11 20:52:00 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-02-13 03:17:40 +0100 |
| commit | 6742e4d0e3c3da63469049a5c5230746a3104d30 (patch) | |
| tree | fc2c273567c62551f2788889c11b6be9984a01cf | |
| parent | aed38bc7c09faffa1c4c58cb28d18965f7fa06ca (diff) | |
| download | slackbuilds-6742e4d0e3c3da63469049a5c5230746a3104d30.tar.gz | |
system/heirloom-pax: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/heirloom-pax/heirloom-pax.SlackBuild | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/system/heirloom-pax/heirloom-pax.SlackBuild b/system/heirloom-pax/heirloom-pax.SlackBuild index 3ab8944744..30ac082e2a 100644 --- a/system/heirloom-pax/heirloom-pax.SlackBuild +++ b/system/heirloom-pax/heirloom-pax.SlackBuild @@ -4,6 +4,8 @@ # Written by ruario <sbo@ruari.com> +# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=heirloom-pax @@ -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,9 +56,13 @@ cd heirloom-$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 \ + -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 {} \+ + +# 20220211 bkw: 15.0 needs this: +sed -i 's,mkdev\.h,sysmacros.h,' cpio/cpio.c +SLKCFLAGS+=" -fcommon" # Patch the paths in the man page to use /usr/lib/heirloom/bin, rather # than /usr/5bin (where the upstream maintainer suggests). This is |