diff options
Diffstat (limited to 'source/ap/vim/vim-gvim.SlackBuild')
| -rwxr-xr-x | source/ap/vim/vim-gvim.SlackBuild | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index 0af5aabec..0f8ff3846 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,15 @@ # This package must be build right after the main vim package, and the # generated vim package must still be in $TMP. -VIMBRANCH=7.4 -VERSION=$(echo vim-${VIMBRANCH}*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +# To prevent a collision with a vim.SlackBuild running at the same time (since +# we'll try to build vim too, if it isn't available), we REQUIRE_GLOBAL_LOCK for +# this package when used with make_world.sh. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=vim-gvim +VIMBRANCH=8.1 +VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -37,6 +44,14 @@ 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) @@ -50,7 +65,6 @@ else fi export SLKLDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-vim-gvim @@ -59,7 +73,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf vim-$VERSION -tar xvf $CWD/vim-$VERSION.tar.xz || exit 1 +tar xvf $CWD/vim-$VERSION.tar.?z || exit 1 config_vim() { CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \ @@ -68,13 +82,15 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \ --prefix=/usr \ --enable-pythoninterp \ --with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \ + --enable-python3interp \ + --with-python3-config-dir=$(python3-config --configdir) \ --enable-perlinterp \ --disable-tclinterp \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ --with-compiledby="<volkerdi@slackware.com>" \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # I had been adding this, but got 100% complaints and 0% kudos: # --enable-rubyinterp @@ -90,7 +106,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -config_vim --with-x --enable-gui=gtk2 +config_vim --with-x --enable-gui=gtk3 || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -151,15 +167,15 @@ rm -f vimtutor xxd # Now we get rid of everything that's not in the other vim package. # Let's assume (dangerous ;-) that we just built that in $TMP # and use it as a reference: -if ! /bin/ls $TMP/vim-${VERSION}*txz 1> /dev/null 2> /dev/null ; then - echo "FATAL: VIM package needed in $TMP" - exit 1 +if ! /bin/ls $TMP/vim-${VERSION}-${ARCH}-${BUILD}.txz 1> /dev/null 2> /dev/null ; then + # We assumed wrong. So build it: + $CWD/vim.SlackBuild fi mkdir $PKG/vim ( cd $PKG ( cd vim - echo "Extracting reference package $TMP/vim-${VERSION}*txz:" - explodepkg $TMP/vim-${VERSION}*txz 1> /dev/null + echo "Extracting reference package $TMP/vim-${VERSION}-${ARCH}-${BUILD}.txz:" + explodepkg $TMP/vim-${VERSION}-${ARCH}-${BUILD}.txz 1> /dev/null sh install/doinst.sh ) ) |