summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-04 18:09:54 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-04 18:09:54 +0100
commit6cd42db9dc1251b052b97d47bafc063eacac1b3e (patch)
treec1702b00dc85a1303183f7136e098a346594c44f
parentf6c177ab3acda131d693f2cab0796df16da5b732 (diff)
downloadvim-git-6cd42db9dc1251b052b97d47bafc063eacac1b3e.tar.gz
patch 8.2.2089: libvterm test fails to build on Macv8.2.2089
Problem: Libvterm test fails to build on Mac. Solution: Adjust configure to remove a space between -L and the path that follows.
-rwxr-xr-xsrc/auto/configure2
-rw-r--r--src/configure.ac4
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure
index d1359485b..205312a3b 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14861,6 +14861,8 @@ else
$as_echo "no" >&6; }
fi
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
$as_echo_n "checking linker --as-needed support... " >&6; }
LINK_AS_NEEDED=
diff --git a/src/configure.ac b/src/configure.ac
index 010cc8f09..4b6794a29 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4467,6 +4467,10 @@ else
AC_MSG_RESULT(no)
fi
+dnl $LDFLAGS is passed to glibtool in libvterm, it doesn't like a space
+dnl between "-L" and the path that follows.
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
dnl link.sh tries to avoid overlinking in a hackish way.
dnl At least GNU ld supports --as-needed which provides the same functionality
dnl at linker level. Let's use it.
diff --git a/src/version.c b/src/version.c
index 36aa84092..8b8a6c32a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2089,
+/**/
2088,
/**/
2087,