Karsten Hopp e1a7dc
To: vim_dev@googlegroups.com
Karsten Hopp e1a7dc
Subject: Patch 7.4.650
Karsten Hopp e1a7dc
Fcc: outbox
Karsten Hopp e1a7dc
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp e1a7dc
Mime-Version: 1.0
Karsten Hopp e1a7dc
Content-Type: text/plain; charset=UTF-8
Karsten Hopp e1a7dc
Content-Transfer-Encoding: 8bit
Karsten Hopp e1a7dc
------------
Karsten Hopp e1a7dc
Karsten Hopp e1a7dc
Patch 7.4.650
Karsten Hopp e1a7dc
Problem:    Configure check may fail because the dl library is not used.
Karsten Hopp e1a7dc
Solution:   Put "-ldl" in LIBS rather than LDFLAGS. (Oazki Kiichi)
Karsten Hopp e1a7dc
Files:      src/configure.in, src/auto/configure
Karsten Hopp e1a7dc
Karsten Hopp e1a7dc
Karsten Hopp e1a7dc
*** ../vim-7.4.649/src/configure.in	2014-11-30 13:34:16.889626728 +0100
Karsten Hopp e1a7dc
--- src/configure.in	2015-03-05 16:17:09.240514899 +0100
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 1451,1459 ****
Karsten Hopp e1a7dc
    AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python)
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON_CFLAGS"
Karsten Hopp e1a7dc
!   ldflags_save=$LDFLAGS
Karsten Hopp e1a7dc
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
Karsten Hopp e1a7dc
!   LDFLAGS="-ldl $LDFLAGS"
Karsten Hopp e1a7dc
    AC_RUN_IFELSE([AC_LANG_SOURCE([
Karsten Hopp e1a7dc
      #include <dlfcn.h>
Karsten Hopp e1a7dc
      /* If this program fails, then RTLD_GLOBAL is needed.
Karsten Hopp e1a7dc
--- 1451,1459 ----
Karsten Hopp e1a7dc
    AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python)
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON_CFLAGS"
Karsten Hopp e1a7dc
!   libs_save=$LIBS
Karsten Hopp e1a7dc
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
Karsten Hopp e1a7dc
!   LIBS="-ldl $LIBS"
Karsten Hopp e1a7dc
    AC_RUN_IFELSE([AC_LANG_SOURCE([
Karsten Hopp e1a7dc
      #include <dlfcn.h>
Karsten Hopp e1a7dc
      /* If this program fails, then RTLD_GLOBAL is needed.
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 1491,1504 ****
Karsten Hopp e1a7dc
      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LDFLAGS=$ldflags_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
Karsten Hopp e1a7dc
!   ldflags_save=$LDFLAGS
Karsten Hopp e1a7dc
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
Karsten Hopp e1a7dc
!   LDFLAGS="-ldl $LDFLAGS"
Karsten Hopp e1a7dc
    AC_RUN_IFELSE([AC_LANG_SOURCE([
Karsten Hopp e1a7dc
      #include <dlfcn.h>
Karsten Hopp e1a7dc
      #include <wchar.h>
Karsten Hopp e1a7dc
--- 1491,1504 ----
Karsten Hopp e1a7dc
      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LIBS=$libs_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
Karsten Hopp e1a7dc
!   libs_save=$LIBS
Karsten Hopp e1a7dc
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
Karsten Hopp e1a7dc
!   LIBS="-ldl $LIBS"
Karsten Hopp e1a7dc
    AC_RUN_IFELSE([AC_LANG_SOURCE([
Karsten Hopp e1a7dc
      #include <dlfcn.h>
Karsten Hopp e1a7dc
      #include <wchar.h>
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 1537,1543 ****
Karsten Hopp e1a7dc
      [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LDFLAGS=$ldflags_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    PYTHON_SRC="if_python.c"
Karsten Hopp e1a7dc
    PYTHON_OBJ="objects/if_python.o"
Karsten Hopp e1a7dc
--- 1537,1543 ----
Karsten Hopp e1a7dc
      [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LIBS=$libs_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    PYTHON_SRC="if_python.c"
Karsten Hopp e1a7dc
    PYTHON_OBJ="objects/if_python.o"
Karsten Hopp e1a7dc
*** ../vim-7.4.649/src/auto/configure	2014-11-30 13:34:16.893626683 +0100
Karsten Hopp e1a7dc
--- src/auto/configure	2015-03-05 16:17:12.664476274 +0100
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 6367,6374 ****
Karsten Hopp e1a7dc
  $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; }
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON_CFLAGS"
Karsten Hopp e1a7dc
!   ldflags_save=$LDFLAGS
Karsten Hopp e1a7dc
!     LDFLAGS="-ldl $LDFLAGS"
Karsten Hopp e1a7dc
    if test "$cross_compiling" = yes; then :
Karsten Hopp e1a7dc
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
Karsten Hopp e1a7dc
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
Karsten Hopp e1a7dc
--- 6367,6374 ----
Karsten Hopp e1a7dc
  $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; }
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON_CFLAGS"
Karsten Hopp e1a7dc
!   libs_save=$LIBS
Karsten Hopp e1a7dc
!     LIBS="-ldl $LIBS"
Karsten Hopp e1a7dc
    if test "$cross_compiling" = yes; then :
Karsten Hopp e1a7dc
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
Karsten Hopp e1a7dc
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 6426,6439 ****
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LDFLAGS=$ldflags_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5
Karsten Hopp e1a7dc
  $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; }
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
Karsten Hopp e1a7dc
!   ldflags_save=$LDFLAGS
Karsten Hopp e1a7dc
!     LDFLAGS="-ldl $LDFLAGS"
Karsten Hopp e1a7dc
    if test "$cross_compiling" = yes; then :
Karsten Hopp e1a7dc
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
Karsten Hopp e1a7dc
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
Karsten Hopp e1a7dc
--- 6426,6439 ----
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LIBS=$libs_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5
Karsten Hopp e1a7dc
  $as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; }
Karsten Hopp e1a7dc
    cflags_save=$CFLAGS
Karsten Hopp e1a7dc
    CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
Karsten Hopp e1a7dc
!   libs_save=$LIBS
Karsten Hopp e1a7dc
!     LIBS="-ldl $LIBS"
Karsten Hopp e1a7dc
    if test "$cross_compiling" = yes; then :
Karsten Hopp e1a7dc
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
Karsten Hopp e1a7dc
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 6492,6498 ****
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LDFLAGS=$ldflags_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    PYTHON_SRC="if_python.c"
Karsten Hopp e1a7dc
    PYTHON_OBJ="objects/if_python.o"
Karsten Hopp e1a7dc
--- 6492,6498 ----
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    CFLAGS=$cflags_save
Karsten Hopp e1a7dc
!   LIBS=$libs_save
Karsten Hopp e1a7dc
  
Karsten Hopp e1a7dc
    PYTHON_SRC="if_python.c"
Karsten Hopp e1a7dc
    PYTHON_OBJ="objects/if_python.o"
Karsten Hopp e1a7dc
*** ../vim-7.4.649/src/version.c	2015-03-05 13:35:52.421943998 +0100
Karsten Hopp e1a7dc
--- src/version.c	2015-03-05 16:14:30.798302587 +0100
Karsten Hopp e1a7dc
***************
Karsten Hopp e1a7dc
*** 743,744 ****
Karsten Hopp e1a7dc
--- 743,746 ----
Karsten Hopp e1a7dc
  {   /* Add new patch number below this line */
Karsten Hopp e1a7dc
+ /**/
Karsten Hopp e1a7dc
+     650,
Karsten Hopp e1a7dc
  /**/
Karsten Hopp e1a7dc
Karsten Hopp e1a7dc
-- 
Karsten Hopp e1a7dc
TALL KNIGHT: We shall say Ni! again to you if you do not appease us.
Karsten Hopp e1a7dc
ARTHUR:      All right!  What do you want?
Karsten Hopp e1a7dc
TALL KNIGHT: We want ... a shrubbery!
Karsten Hopp e1a7dc
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
Karsten Hopp e1a7dc
Karsten Hopp e1a7dc
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp e1a7dc
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp e1a7dc
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp e1a7dc
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///