diff options
Diffstat (limited to 'source/l/libxklavier')
| -rwxr-xr-x | source/l/libxklavier/libxklavier.SlackBuild | 29 | ||||
| -rw-r--r-- | source/l/libxklavier/slack-desc | 8 |
2 files changed, 25 insertions, 12 deletions
diff --git a/source/l/libxklavier/libxklavier.SlackBuild b/source/l/libxklavier/libxklavier.SlackBuild index 428036f81..0b35f351b 100755 --- a/source/l/libxklavier/libxklavier.SlackBuild +++ b/source/l/libxklavier/libxklavier.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Copyright 2007, 2008, 2013 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,26 +23,36 @@ # Modified by Robby Workman <rworkman at slackware.com> +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libxklavier VERSION=${VERSION:-$(echo libxklavier-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-libxklavier -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -77,11 +87,14 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --disable-static \ --with-xkb-base=/etc/X11/xkb \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/l/libxklavier/slack-desc b/source/l/libxklavier/slack-desc index 9d02b12dc..47ee82255 100644 --- a/source/l/libxklavier/slack-desc +++ b/source/l/libxklavier/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------| @@ -10,7 +10,7 @@ libxklavier: libxklavier (XKB Library) libxklavier: libxklavier: libxklavier is a utility library to make XKB stuff easier. libxklavier: -libxklavier: Homepage: http://www.freedesktop.org/wiki/Software/LibXklavier +libxklavier: Homepage: http://www.freedesktop.org/wiki/Software/LibXklavier libxklavier: libxklavier: libxklavier: |