diff options
Diffstat (limited to 'system/cndrvcups-common/cndrvcups-common.SlackBuild')
| -rw-r--r-- | system/cndrvcups-common/cndrvcups-common.SlackBuild | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/system/cndrvcups-common/cndrvcups-common.SlackBuild b/system/cndrvcups-common/cndrvcups-common.SlackBuild index a39ab0866e..154cf6c0a9 100644 --- a/system/cndrvcups-common/cndrvcups-common.SlackBuild +++ b/system/cndrvcups-common/cndrvcups-common.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for cndrvcups-common @@ -22,26 +22,38 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220209 bkw: Modified by SlackBuilds.org, fix build on 15.0. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=cndrvcups-common VERSION=${VERSION:-3.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +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 -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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + 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" @@ -69,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +SLKCFLAGS+=" -fcommon" + ( cd buftool CFLAGS="$SLKCFLAGS" \ @@ -80,8 +94,10 @@ find -L . \ make install DESTDIR=$PKG ) +# 20220209 bkw: for some reason this wasn't picking up the libs it needs... ( cd cngplp + LIBS="$( pkg-config --libs glib-2.0 gmodule-2.0 gtk+-2.0 )" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh \ @@ -145,4 +161,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |