7.3.613

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.613
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.613
  11 Problem:    Including Python's config.c in the build causes trouble.  It is
  12             not clear why it was there.
  13 Solution:   Omit the config file. (James McCoy)
  14 Files:      src/Makefile, src/auto/configure, src/configure.in
  15
  16
  17 *** ../vim-7.3.612/src/Makefile 2012-06-20 18:39:12.000000000 +0200
  18 --- src/Makefile        2012-07-25 16:22:57.000000000 +0200
  19 ***************
  20 *** 2559,2577 ****
  21   objects/if_perlsfio.o: if_perlsfio.c
  22         $(CCC) $(PERL_CFLAGS) -o $@ if_perlsfio.c
  23
  24 - objects/py_config.o: $(PYTHON_CONFDIR)/config.c
  25 -       $(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/config.c \
  26 -               -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
  27 -
  28   objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c
  29         $(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/getpath.c \
  30                 -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
  31                 $(PYTHON_GETPATH_CFLAGS)
  32
  33 - objects/py3_config.o: $(PYTHON3_CONFDIR)/config.c
  34 -       $(CCC) $(PYTHON3_CFLAGS) -o $@ $(PYTHON3_CONFDIR)/config.c \
  35 -               -I$(PYTHON3_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
  36 -
  37   objects/if_python.o: if_python.c if_py_both.h
  38         $(CCC) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
  39
  40 --- 2559,2569 ----
  41 *** ../vim-7.3.612/src/auto/configure   2012-06-13 19:19:36.000000000 +0200
  42 --- src/auto/configure  2012-07-25 16:23:49.000000000 +0200
  43 ***************
  44 *** 5357,5367 ****
  45           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
  46         fi
  47         PYTHON_SRC="if_python.c"
  48 !               if test "x$MACOSX" = "xyes"; then
  49 !         PYTHON_OBJ="objects/if_python.o"
  50 !       else
  51 !         PYTHON_OBJ="objects/if_python.o objects/py_config.o"
  52 !       fi
  53         if test "${vi_cv_var_python_version}" = "1.4"; then
  54            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
  55         fi
  56 --- 5357,5363 ----
  57           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
  58         fi
  59         PYTHON_SRC="if_python.c"
  60 !       PYTHON_OBJ="objects/if_python.o"
  61         if test "${vi_cv_var_python_version}" = "1.4"; then
  62            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
  63         fi
  64 ***************
  65 *** 5656,5666 ****
  66           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  67         fi
  68         PYTHON3_SRC="if_python3.c"
  69 !             if test "x$MACOSX" = "xyes"; then
  70 !         PYTHON3_OBJ="objects/if_python3.o"
  71 !       else
  72 !         PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
  73 !       fi
  74
  75                                                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
  76   $as_echo_n "checking if -pthread should be used... " >&6; }
  77 --- 5652,5658 ----
  78           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  79         fi
  80         PYTHON3_SRC="if_python3.c"
  81 !       PYTHON3_OBJ="objects/if_python3.o"
  82
  83                                                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
  84   $as_echo_n "checking if -pthread should be used... " >&6; }
  85 *** ../vim-7.3.612/src/configure.in     2012-06-13 19:19:36.000000000 +0200
  86 --- src/configure.in    2012-07-25 16:23:41.000000000 +0200
  87 ***************
  88 *** 916,927 ****
  89           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
  90         fi
  91         PYTHON_SRC="if_python.c"
  92 !       dnl For Mac OSX 10.2 config.o is included in the Python library.
  93 !       if test "x$MACOSX" = "xyes"; then
  94 !         PYTHON_OBJ="objects/if_python.o"
  95 !       else
  96 !         PYTHON_OBJ="objects/if_python.o objects/py_config.o"
  97 !       fi
  98         if test "${vi_cv_var_python_version}" = "1.4"; then
  99            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
 100         fi
 101 --- 916,922 ----
 102           PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
 103         fi
 104         PYTHON_SRC="if_python.c"
 105 !       PYTHON_OBJ="objects/if_python.o"
 106         if test "${vi_cv_var_python_version}" = "1.4"; then
 107            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
 108         fi
 109 ***************
 110 *** 1106,1117 ****
 111           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
 112         fi
 113         PYTHON3_SRC="if_python3.c"
 114 !       dnl For Mac OSX 10.2 config.o is included in the Python library.
 115 !       if test "x$MACOSX" = "xyes"; then
 116 !         PYTHON3_OBJ="objects/if_python3.o"
 117 !       else
 118 !         PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
 119 !       fi
 120
 121         dnl On FreeBSD linking with "-pthread" is required to use threads.
 122         dnl _THREAD_SAFE must be used for compiling then.
 123 --- 1101,1107 ----
 124           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
 125         fi
 126         PYTHON3_SRC="if_python3.c"
 127 !       PYTHON3_OBJ="objects/if_python3.o"
 128
 129         dnl On FreeBSD linking with "-pthread" is required to use threads.
 130         dnl _THREAD_SAFE must be used for compiling then.
 131 *** ../vim-7.3.612/src/version.c        2012-07-25 16:09:59.000000000 +0200
 132 --- src/version.c       2012-07-25 16:29:52.000000000 +0200
 133 ***************
 134 *** 716,717 ****
 135 --- 716,719 ----
 136   {   /* Add new patch number below this line */
 137 + /**/
 138 +     613,
 139   /**/
 140
 141 --
 142 hundred-and-one symptoms of being an internet addict:
 143 170. You introduce your wife as "my_lady@home.wife" and refer to your
 144      children as "forked processes."
 145
 146  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 147 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 148 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 149  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///