From 8b733e4856035d35e553bb21ca0b994d1f33146d Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 20 Mar 2022 01:34:42 -0400 Subject: desktop/kwalletcli: Fix 32-bit build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- desktop/kwalletcli/kwalletcli.SlackBuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'desktop') diff --git a/desktop/kwalletcli/kwalletcli.SlackBuild b/desktop/kwalletcli/kwalletcli.SlackBuild index 8220f6a9f7..085cb8ff26 100644 --- a/desktop/kwalletcli/kwalletcli.SlackBuild +++ b/desktop/kwalletcli/kwalletcli.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kwalletcli @@ -38,9 +40,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 @@ -50,11 +49,13 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +# 20220320 bkw: Nonstandard flags: -fPIC is required for 32-bit +# kwalletcli builds. if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -75,9 +76,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 \ + -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 $PKG/usr/bin $PKG/usr/man/man1 CFLAGS="$SLKCFLAGS" \ -- cgit v1.2.3