To: vim_dev@googlegroups.com
Subject: Patch 8.2.2852
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2852
Problem:    Configure can add --as-needed a second time.
Solution:   Only add --as-needed if not already there.  (Natanael Copa,
            closes #8189, closes #8181)
Files:      src/configure.ac, src/auto/configure


*** ../vim-8.2.2851/src/configure.ac	2021-04-21 11:57:56.210840126 +0200
--- src/configure.ac	2021-05-15 14:22:51.819984412 +0200
***************
*** 4519,4525 ****
  LINK_AS_NEEDED=
  # Check if linker supports --as-needed and --no-as-needed options
  if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
!   LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
    LINK_AS_NEEDED=yes
  fi
  if test "$LINK_AS_NEEDED" = yes; then
--- 4519,4527 ----
  LINK_AS_NEEDED=
  # Check if linker supports --as-needed and --no-as-needed options
  if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
!   if ! echo "$LDFLAGS" | grep -q -- '-Wl,[[^[:space:]]]*--as-needed'; then
!     LDFLAGS="$LDFLAGS -Wl,--as-needed"
!   fi
    LINK_AS_NEEDED=yes
  fi
  if test "$LINK_AS_NEEDED" = yes; then
*** ../vim-8.2.2851/src/auto/configure	2021-04-21 11:57:56.214840116 +0200
--- src/auto/configure	2021-05-15 14:22:54.515973831 +0200
***************
*** 14937,14943 ****
  LINK_AS_NEEDED=
  # Check if linker supports --as-needed and --no-as-needed options
  if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
!   LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-Wl,--as-needed//g' | sed -e 's/$/ -Wl,--as-needed/'`
    LINK_AS_NEEDED=yes
  fi
  if test "$LINK_AS_NEEDED" = yes; then
--- 14937,14945 ----
  LINK_AS_NEEDED=
  # Check if linker supports --as-needed and --no-as-needed options
  if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
!   if ! echo "$LDFLAGS" | grep -q -- '-Wl,[^[:space:]]*--as-needed'; then
!     LDFLAGS="$LDFLAGS -Wl,--as-needed"
!   fi
    LINK_AS_NEEDED=yes
  fi
  if test "$LINK_AS_NEEDED" = yes; then
*** ../vim-8.2.2851/src/version.c	2021-05-15 13:19:12.195816386 +0200
--- src/version.c	2021-05-15 14:25:12.935427221 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2852,
  /**/

-- 
Error:015 - Unable to exit Windows.  Try the door.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///