Patch 8.0.1699
Problem: Leftover stuff for Python 1.4.
Solution: Remove outdated Python 1.4 stuff. (Naoki Inada, closes #2794)
Files: src/Makefile, src/config.aap.in, src/config.mk.in,
src/configure.ac, src/auto/configure
*** ../vim-8.0.1698/src/Makefile 2018-04-10 19:23:59.281563695 +0200
--- src/Makefile 2018-04-11 22:14:38.354100550 +0200
***************
*** 3170,3181 ****
objects/if_perlsfio.o: if_perlsfio.c
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ if_perlsfio.c
- objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c
- $(CCC_NF) $(PYTHON_CFLAGS) $(ALL_CFLAGS) -o $@ \
- $(PYTHON_CONFDIR)/getpath.c \
- -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
- $(PYTHON_GETPATH_CFLAGS)
-
objects/if_python.o: if_python.c if_py_both.h
$(CCC_NF) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) $(ALL_CFLAGS) -o $@
if_python.c
--- 3172,3177 ----
*** ../vim-8.0.1698/src/config.aap.in 2016-02-27 18:03:48.000000000 +0100
--- src/config.aap.in 2018-04-11 22:14:38.354100550 +0200
***************
*** 47,54 ****
PYTHON_OBJ = @PYTHON_OBJ@
PYTHON_CFLAGS = @PYTHON_CFLAGS@
PYTHON_LIBS = @PYTHON_LIBS@
- PYTHON_CONFDIR = @PYTHON_CONFDIR@
- PYTHON_GETPATH_CFLAGS = @PYTHON_GETPATH_CFLAGS@
TCL = @vi_cv_path_tcl@
TCL_SRC = @TCL_SRC@
--- 47,52 ----
*** ../vim-8.0.1698/src/config.mk.in 2017-07-07 11:53:29.507876589 +0200
--- src/config.mk.in 2018-04-11 22:14:38.354100550 +0200
***************
*** 65,78 ****
PYTHON_OBJ = @PYTHON_OBJ@
PYTHON_CFLAGS = @PYTHON_CFLAGS@
PYTHON_LIBS = @PYTHON_LIBS@
- PYTHON_CONFDIR = @PYTHON_CONFDIR@
- PYTHON_GETPATH_CFLAGS = @PYTHON_GETPATH_CFLAGS@
PYTHON3_SRC = @PYTHON3_SRC@
PYTHON3_OBJ = @PYTHON3_OBJ@
PYTHON3_CFLAGS = @PYTHON3_CFLAGS@
PYTHON3_LIBS = @PYTHON3_LIBS@
- PYTHON3_CONFDIR = @PYTHON3_CONFDIR@
TCL = @vi_cv_path_tcl@
TCL_SRC = @TCL_SRC@
--- 65,75 ----
*** ../vim-8.0.1698/src/configure.ac 2018-04-10 20:26:14.267224512 +0200
--- src/configure.ac 2018-04-11 22:14:38.354100550 +0200
***************
*** 1211,1221 ****
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX}
-framework Python"
fi
else
! if test "${vi_cv_var_python_version}" = "1.4"; then
! vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a
${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a
${PYTHON_CONFDIR}/libParser.a"
! else
! vi_cv_path_python_plibs="-L${PYTHON_CONFDIR}
-lpython${vi_cv_var_python_version}"
! fi
dnl -- Check if the path contained in python_LINKFORSHARED is
dnl usable for vim build. If not, make and try other
dnl candidates.
--- 1211,1217 ----
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX}
-framework Python"
fi
else
! vi_cv_path_python_plibs="-L${PYTHON_CONFDIR}
-lpython${vi_cv_var_python_version}"
dnl -- Check if the path contained in python_LINKFORSHARED is
dnl usable for vim build. If not, make and try other
dnl candidates.
***************
*** 1262,1271 ****
fi
PYTHON_SRC="if_python.c"
PYTHON_OBJ="objects/if_python.o"
- if test "${vi_cv_var_python_version}" = "1.4"; then
- PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
- fi
- PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"'
-DPREFIX='\"${vi_cv_path_python_pfx}\"'
-DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
dnl On FreeBSD linking with "-pthread" is required to use threads.
dnl _THREAD_SAFE must be used for compiling then.
--- 1258,1263 ----
***************
*** 1334,1342 ****
fi
fi
- AC_SUBST(PYTHON_CONFDIR)
AC_SUBST(PYTHON_LIBS)
- AC_SUBST(PYTHON_GETPATH_CFLAGS)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_SRC)
AC_SUBST(PYTHON_OBJ)
--- 1326,1332 ----
***************
*** 1542,1548 ****
fi
fi
- AC_SUBST(PYTHON3_CONFDIR)
AC_SUBST(PYTHON3_LIBS)
AC_SUBST(PYTHON3_CFLAGS)
AC_SUBST(PYTHON3_SRC)
--- 1532,1537 ----
***************
*** 4382,4388 ****
dnl consistent value. It's therefore safest to force the use of the define
dnl if it's present in any of the *_CFLAGS variables.
AC_MSG_CHECKING(whether we need to force -D_FILE_OFFSET_BITS=64)
! if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS
$PYTHON_GETPATH_CFLAGS $PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS
$GTK_CFLAGS" | grep -q D_FILE_OFFSET_BITS 2>/dev/null; then
AC_MSG_RESULT(yes)
AC_DEFINE(_FILE_OFFSET_BITS, 64)
else
--- 4371,4377 ----
dnl consistent value. It's therefore safest to force the use of the define
dnl if it's present in any of the *_CFLAGS variables.
AC_MSG_CHECKING(whether we need to force -D_FILE_OFFSET_BITS=64)
! if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS
$PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q
D_FILE_OFFSET_BITS 2>/dev/null; then
AC_MSG_RESULT(yes)
AC_DEFINE(_FILE_OFFSET_BITS, 64)
else
*** ../vim-8.0.1698/src/auto/configure 2018-04-10 20:26:14.271224484 +0200
--- src/auto/configure 2018-04-11 22:17:13.765000378 +0200
***************
*** 679,692 ****
PYTHON3_SRC
PYTHON3_CFLAGS
PYTHON3_LIBS
- PYTHON3_CONFDIR
vi_cv_path_python3
PYTHON_OBJ
PYTHON_SRC
PYTHON_CFLAGS
- PYTHON_GETPATH_CFLAGS
PYTHON_LIBS
- PYTHON_CONFDIR
vi_cv_path_python
PERL_LIBS
PERL_CFLAGS
--- 679,689 ----
***************
*** 6018,6028 ****
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX}
-framework Python"
fi
else
! if test "${vi_cv_var_python_version}" = "1.4"; then
! vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a
${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a
${PYTHON_CONFDIR}/libParser.a"
! else
! vi_cv_path_python_plibs="-L${PYTHON_CONFDIR}
-lpython${vi_cv_var_python_version}"
! fi
if test -n "${python_LINKFORSHARED}" &&
test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^
\t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'`
python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([^
\t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t][ \t]*\(.*\)/\2/'`
--- 6015,6021 ----
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX}
-framework Python"
fi
else
! vi_cv_path_python_plibs="-L${PYTHON_CONFDIR}
-lpython${vi_cv_var_python_version}"
if test -n "${python_LINKFORSHARED}" &&
test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^
\t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'`
python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([^
\t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t][ \t]*\(.*\)/\2/'`
***************
*** 6068,6077 ****
fi
PYTHON_SRC="if_python.c"
PYTHON_OBJ="objects/if_python.o"
- if test "${vi_cv_var_python_version}" = "1.4"; then
- PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
- fi
- PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"'
-DPREFIX='\"${vi_cv_path_python_pfx}\"'
-DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
{ $as_echo
"$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
$as_echo_n "checking if -pthread should be used... " >&6; }
--- 6061,6066 ----
***************
*** 6175,6182 ****
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-python3interp
argument" >&5
$as_echo_n "checking --enable-python3interp argument... " >&6; }
# Check whether --enable-python3interp was given.
--- 6164,6169 ----
***************
*** 6504,6510 ****
-
if test "$python_ok" = yes && test "$python3_ok" = yes; then
$as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
--- 6491,6496 ----
***************
*** 14323,14329 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to force
-D_FILE_OFFSET_BITS=64" >&5
$as_echo_n "checking whether we need to force -D_FILE_OFFSET_BITS=64... "
>&6; }
! if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS
$PYTHON_GETPATH_CFLAGS $PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS
$GTK_CFLAGS" | grep -q D_FILE_OFFSET_BITS 2>/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
--- 14309,14315 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to force
-D_FILE_OFFSET_BITS=64" >&5
$as_echo_n "checking whether we need to force -D_FILE_OFFSET_BITS=64... "
>&6; }
! if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS
$PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q
D_FILE_OFFSET_BITS 2>/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
*** ../vim-8.0.1698/src/version.c 2018-04-11 21:03:05.145310945 +0200
--- src/version.c 2018-04-11 22:18:30.216455736 +0200
***************
*** 764,765 ****
--- 764,767 ----
{ /* Add new patch number below this line */
+ /**/
+ 1699,
/**/
--
hundred-and-one symptoms of being an internet addict:
165. You have a web page burned into your glasses
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
