rpms / vim

Clone
Source Code
GIT

Blame 7.3.613

c4 c5 c5-plus c6 c6-plus c7 c7-alt c7-beta c8 c8-beta c8s c9 c9-beta c9s-sig-hyperscale
  1.   7643fc95949d2e7c6c4fde9d9921bfcb7962a470
  2.   7.3.613
Blob History Raw
Karsten Hopp 89ade8 
To: vim_dev@googlegroups.com
Karsten Hopp 89ade8 
Subject: Patch 7.3.613
Karsten Hopp 89ade8 
Fcc: outbox
Karsten Hopp 89ade8 
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 89ade8 
Mime-Version: 1.0
Karsten Hopp 89ade8 
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 89ade8 
Content-Transfer-Encoding: 8bit
Karsten Hopp 89ade8 
------------
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
Patch 7.3.613
Karsten Hopp 89ade8 
Problem:    Including Python's config.c in the build causes trouble.  It is
Karsten Hopp 89ade8 
	    not clear why it was there.
Karsten Hopp 89ade8 
Solution:   Omit the config file. (James McCoy)
Karsten Hopp 89ade8 
Files:	    src/Makefile, src/auto/configure, src/configure.in
Karsten Hopp 89ade8
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
*** ../vim-7.3.612/src/Makefile	2012-06-20 18:39:12.000000000 +0200
Karsten Hopp 89ade8 
--- src/Makefile	2012-07-25 16:22:57.000000000 +0200
Karsten Hopp 89ade8 
***************
Karsten Hopp 89ade8 
*** 2559,2577 ****
Karsten Hopp 89ade8 
  objects/if_perlsfio.o: if_perlsfio.c
Karsten Hopp 89ade8 
  	$(CCC) $(PERL_CFLAGS) -o $@ if_perlsfio.c
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
- objects/py_config.o: $(PYTHON_CONFDIR)/config.c
Karsten Hopp 89ade8 
- 	$(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/config.c \
Karsten Hopp 89ade8 
- 		-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
Karsten Hopp 89ade8 
-
Karsten Hopp 89ade8 
  objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c
Karsten Hopp 89ade8 
  	$(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/getpath.c \
Karsten Hopp 89ade8 
  		-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
Karsten Hopp 89ade8 
  		$(PYTHON_GETPATH_CFLAGS)
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
- objects/py3_config.o: $(PYTHON3_CONFDIR)/config.c
Karsten Hopp 89ade8 
- 	$(CCC) $(PYTHON3_CFLAGS) -o $@ $(PYTHON3_CONFDIR)/config.c \
Karsten Hopp 89ade8 
- 		-I$(PYTHON3_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN
Karsten Hopp 89ade8 
-
Karsten Hopp 89ade8 
  objects/if_python.o: if_python.c if_py_both.h
Karsten Hopp 89ade8 
  	$(CCC) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
--- 2559,2569 ----
Karsten Hopp 89ade8 
*** ../vim-7.3.612/src/auto/configure	2012-06-13 19:19:36.000000000 +0200
Karsten Hopp 89ade8 
--- src/auto/configure	2012-07-25 16:23:49.000000000 +0200
Karsten Hopp 89ade8 
***************
Karsten Hopp 89ade8 
*** 5357,5367 ****
Karsten Hopp 89ade8 
  	  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}\\\""
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
  	PYTHON_SRC="if_python.c"
Karsten Hopp 89ade8 
! 		if test "x$MACOSX" = "xyes"; then
Karsten Hopp 89ade8 
! 	  PYTHON_OBJ="objects/if_python.o"
Karsten Hopp 89ade8 
! 	else
Karsten Hopp 89ade8 
! 	  PYTHON_OBJ="objects/if_python.o objects/py_config.o"
Karsten Hopp 89ade8 
! 	fi
Karsten Hopp 89ade8 
  	if test "${vi_cv_var_python_version}" = "1.4"; then
Karsten Hopp 89ade8 
  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
--- 5357,5363 ----
Karsten Hopp 89ade8 
  	  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}\\\""
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
  	PYTHON_SRC="if_python.c"
Karsten Hopp 89ade8 
! 	PYTHON_OBJ="objects/if_python.o"
Karsten Hopp 89ade8 
  	if test "${vi_cv_var_python_version}" = "1.4"; then
Karsten Hopp 89ade8 
  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
***************
Karsten Hopp 89ade8 
*** 5656,5666 ****
Karsten Hopp 89ade8 
          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}\\\""
Karsten Hopp 89ade8 
        fi
Karsten Hopp 89ade8 
        PYTHON3_SRC="if_python3.c"
Karsten Hopp 89ade8 
!             if test "x$MACOSX" = "xyes"; then
Karsten Hopp 89ade8 
!         PYTHON3_OBJ="objects/if_python3.o"
Karsten Hopp 89ade8 
!       else
Karsten Hopp 89ade8 
!         PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
Karsten Hopp 89ade8 
!       fi
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
Karsten Hopp 89ade8 
  $as_echo_n "checking if -pthread should be used... " >&6; }
Karsten Hopp 89ade8 
--- 5652,5658 ----
Karsten Hopp 89ade8 
          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}\\\""
Karsten Hopp 89ade8 
        fi
Karsten Hopp 89ade8 
        PYTHON3_SRC="if_python3.c"
Karsten Hopp 89ade8 
!       PYTHON3_OBJ="objects/if_python3.o"
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
Karsten Hopp 89ade8 
  $as_echo_n "checking if -pthread should be used... " >&6; }
Karsten Hopp 89ade8 
*** ../vim-7.3.612/src/configure.in	2012-06-13 19:19:36.000000000 +0200
Karsten Hopp 89ade8 
--- src/configure.in	2012-07-25 16:23:41.000000000 +0200
Karsten Hopp 89ade8 
***************
Karsten Hopp 89ade8 
*** 916,927 ****
Karsten Hopp 89ade8 
  	  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}\\\""
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
  	PYTHON_SRC="if_python.c"
Karsten Hopp 89ade8 
! 	dnl For Mac OSX 10.2 config.o is included in the Python library.
Karsten Hopp 89ade8 
! 	if test "x$MACOSX" = "xyes"; then
Karsten Hopp 89ade8 
! 	  PYTHON_OBJ="objects/if_python.o"
Karsten Hopp 89ade8 
! 	else
Karsten Hopp 89ade8 
! 	  PYTHON_OBJ="objects/if_python.o objects/py_config.o"
Karsten Hopp 89ade8 
! 	fi
Karsten Hopp 89ade8 
  	if test "${vi_cv_var_python_version}" = "1.4"; then
Karsten Hopp 89ade8 
  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
--- 916,922 ----
Karsten Hopp 89ade8 
  	  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}\\\""
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
  	PYTHON_SRC="if_python.c"
Karsten Hopp 89ade8 
! 	PYTHON_OBJ="objects/if_python.o"
Karsten Hopp 89ade8 
  	if test "${vi_cv_var_python_version}" = "1.4"; then
Karsten Hopp 89ade8 
  	   PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
Karsten Hopp 89ade8 
  	fi
Karsten Hopp 89ade8 
***************
Karsten Hopp 89ade8 
*** 1106,1117 ****
Karsten Hopp 89ade8 
          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}\\\""
Karsten Hopp 89ade8 
        fi
Karsten Hopp 89ade8 
        PYTHON3_SRC="if_python3.c"
Karsten Hopp 89ade8 
!       dnl For Mac OSX 10.2 config.o is included in the Python library.
Karsten Hopp 89ade8 
!       if test "x$MACOSX" = "xyes"; then
Karsten Hopp 89ade8 
!         PYTHON3_OBJ="objects/if_python3.o"
Karsten Hopp 89ade8 
!       else
Karsten Hopp 89ade8 
!         PYTHON3_OBJ="objects/if_python3.o objects/py3_config.o"
Karsten Hopp 89ade8 
!       fi
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
        dnl On FreeBSD linking with "-pthread" is required to use threads.
Karsten Hopp 89ade8 
        dnl _THREAD_SAFE must be used for compiling then.
Karsten Hopp 89ade8 
--- 1101,1107 ----
Karsten Hopp 89ade8 
          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}\\\""
Karsten Hopp 89ade8 
        fi
Karsten Hopp 89ade8 
        PYTHON3_SRC="if_python3.c"
Karsten Hopp 89ade8 
!       PYTHON3_OBJ="objects/if_python3.o"
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
        dnl On FreeBSD linking with "-pthread" is required to use threads.
Karsten Hopp 89ade8 
        dnl _THREAD_SAFE must be used for compiling then.
Karsten Hopp 89ade8 
*** ../vim-7.3.612/src/version.c	2012-07-25 16:09:59.000000000 +0200
Karsten Hopp 89ade8 
--- src/version.c	2012-07-25 16:29:52.000000000 +0200
Karsten Hopp 89ade8 
***************
Karsten Hopp 89ade8 
*** 716,717 ****
Karsten Hopp 89ade8 
--- 716,719 ----
Karsten Hopp 89ade8 
  {   /* Add new patch number below this line */
Karsten Hopp 89ade8 
+ /**/
Karsten Hopp 89ade8 
+     613,
Karsten Hopp 89ade8 
  /**/
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
--
Karsten Hopp 89ade8 
hundred-and-one symptoms of being an internet addict:
Karsten Hopp 89ade8 
170. You introduce your wife as "my_lady@home.wife" and refer to your
Karsten Hopp 89ade8 
     children as "forked processes."
Karsten Hopp 89ade8
Karsten Hopp 89ade8 
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 89ade8 
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 89ade8 
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 89ade8 
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation