From c53e3a413a82eaadc7b59568a4aea8fa33951525 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 1 Jan 2021 22:45:48 +0000 Subject: Fri Jan 1 22:45:48 UTC 2021 a/exfatprogs-1.0.4-x86_64-1.txz: Added. ap/vim-8.2.2269-x86_64-1.txz: Upgraded. Add Ruby and Tcl support, make language support dynamic if possible. d/ruby-3.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/subversion-1.14.0-x86_64-4.txz: Rebuilt. Recompiled against ruby-3.0.0. l/openexr-2.5.4-x86_64-1.txz: Upgraded. l/python-idna-3.0-x86_64-1.txz: Upgraded. n/cifs-utils-6.12-x86_64-1.txz: Upgraded. n/epic5-2.1.2-x86_64-5.txz: Rebuilt. Recompiled against ruby-3.0.0. x/marisa-0.2.6-x86_64-2.txz: Rebuilt. Recompiled against ruby-3.0.0. xap/vim-gvim-8.2.2269-x86_64-1.txz: Upgraded. Add Ruby and Tcl support, make language support dynamic if possible. --- source/ap/vim/vim-gvim.SlackBuild | 18 ++++++++++-------- source/ap/vim/vim.SlackBuild | 17 ++++++++++------- 2 files changed, 20 insertions(+), 15 deletions(-) (limited to 'source/ap') diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index 5bc65fc77..8091411e8 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -52,6 +52,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# If dynamic support for Ruby works with this $ARCH, then allow it: +if [ "$ARCH" = "x86_64" ]; then + RUBYDYNAMIC="=dynamic" +fi + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) @@ -80,21 +85,18 @@ CFLAGS="$SLKCFLAGS" LDFLAGS="$SLKLDFLAGS" \ ./configure \ $* \ --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-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp${RUBYDYNAMIC} \ + --enable-tclinterp=dynamic \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ --with-compiledby="" \ --build=$ARCH-slackware-linux || exit 1 - - # I had been adding this, but got 100% complaints and 0% kudos: - # --enable-rubyinterp - } cd $TMP/vim-$VERSION || exit 1 diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index 1e9cdd0ae..1ef6744bb 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -60,6 +60,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# If dynamic support for Ruby works with this $ARCH, then allow it: +if [ "$ARCH" = "x86_64" ]; then + RUBYDYNAMIC="=dynamic" +fi + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) @@ -116,21 +121,19 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ $* \ --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 \ + --enable-perlinterp=dynamic \ + --enable-pythoninterp=dynamic \ + --enable-python3interp=dynamic \ + --enable-rubyinterp${RUBYDYNAMIC} \ + --enable-tclinterp=dynamic \ --disable-canberra \ - --disable-tclinterp \ --enable-multibyte \ --enable-cscope \ --with-features=huge \ --with-compiledby="" \ --build=$ARCH-slackware-linux || exit 1 - - # I had been adding this, but got 100% complaints and 0% kudos: - # --enable-rubyinterp } cd $TMP/vim-$VERSION || exit 1 -- cgit v1.2.3