summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/texinfo/texinfo.SlackBuild2
-rwxr-xr-xsource/ap/vim/vim-gvim.SlackBuild9
-rwxr-xr-xsource/ap/vim/vim.SlackBuild9
3 files changed, 15 insertions, 5 deletions
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
index 30a5055d8..3e9e409b8 100755
--- a/source/ap/texinfo/texinfo.SlackBuild
+++ b/source/ap/texinfo/texinfo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=texinfo
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index 8091411e8..19d5060bc 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -34,6 +34,11 @@ VIMBRANCH=8.2
VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BUILD=${BUILD:-1}
+# The possible settings for this are yes/no/dynamic. We've been using dynamic,
+# but that's not currently compiling against perl-5.34.0. So we'll use "yes"
+# until "dynamic" works again, which probably won't take long.
+PERLINTERP=${PERLINTERP:-yes}
+
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -87,7 +92,7 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \
--prefix=/usr \
--with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \
--with-python3-config-dir=$(python3-config --configdir) \
- --enable-perlinterp=dynamic \
+ --enable-perlinterp=$PERLINTERP \
--enable-pythoninterp=dynamic \
--enable-python3interp=dynamic \
--enable-rubyinterp${RUBYDYNAMIC} \
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index 1ef6744bb..437ab495e 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -27,6 +27,11 @@ VIMBRANCH=8.2
CTAGSVER=5.8
BUILD=${BUILD:-1}
+# The possible settings for this are yes/no/dynamic. We've been using dynamic,
+# but that's not currently compiling against perl-5.34.0. So we'll use "yes"
+# until "dynamic" works again, which probably won't take long.
+PERLINTERP=${PERLINTERP:-yes}
+
if [ -r vim-${VIMBRANCH}*.tar.?z ]; then # if there's a source archive already, use the version number from it:
VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
else # need to fetch the latest source archive for this branch:
@@ -123,7 +128,7 @@ CFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--with-python-config-dir=/usr/lib${LIBDIRSUFFIX}/python$PYVER/config \
--with-python3-config-dir=$(python3-config --configdir) \
- --enable-perlinterp=dynamic \
+ --enable-perlinterp=$PERLINTERP \
--enable-pythoninterp=dynamic \
--enable-python3interp=dynamic \
--enable-rubyinterp${RUBYDYNAMIC} \