rpms / vim

Clone
Source Code
GIT

Blame 7.4.409

c4 c5 c5-plus c6 c6-plus c7 c7-alt c7-beta c8 c8-beta c8s c9 c9-beta c9s-sig-hyperscale
  1.   935c7e064955a872b8ac65307f82d9b9d2ab173a
  2.   7.4.409
Blob History Raw
Karsten Hopp 052935 
To: vim_dev@googlegroups.com
Karsten Hopp 052935 
Subject: Patch 7.4.409
Karsten Hopp 052935 
Fcc: outbox
Karsten Hopp 052935 
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 052935 
Mime-Version: 1.0
Karsten Hopp 052935 
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 052935 
Content-Transfer-Encoding: 8bit
Karsten Hopp 052935 
------------
Karsten Hopp 052935
Karsten Hopp 052935 
Patch 7.4.409
Karsten Hopp 052935 
Problem:    Can't build with Perl on Fedora 20.
Karsten Hopp 052935 
Solution:   Find xsubpp in another directory. (Michael Henry)
Karsten Hopp 052935 
Files:	    src/Makefile, src/config.mk.in, src/configure.in,
Karsten Hopp 052935 
	    src/auto/configure
Karsten Hopp 052935
Karsten Hopp 052935
Karsten Hopp 052935 
*** ../vim-7.4.408/src/Makefile	2014-08-10 13:34:59.052785459 +0200
Karsten Hopp 052935 
--- src/Makefile	2014-08-17 16:59:03.527072144 +0200
Karsten Hopp 052935 
***************
Karsten Hopp 052935 
*** 2477,2483 ****
Karsten Hopp 052935
Karsten Hopp 052935 
  auto/if_perl.c: if_perl.xs
Karsten Hopp 052935 
  	$(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
Karsten Hopp 052935 
! 	$(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
Karsten Hopp 052935 
  	    $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
Karsten Hopp 052935
Karsten Hopp 052935 
  auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
Karsten Hopp 052935 
--- 2478,2484 ----
Karsten Hopp 052935
Karsten Hopp 052935 
  auto/if_perl.c: if_perl.xs
Karsten Hopp 052935 
  	$(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
Karsten Hopp 052935 
! 	$(PERL) $(PERL_XSUBPP) -prototypes -typemap \
Karsten Hopp 052935 
  	    $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
Karsten Hopp 052935
Karsten Hopp 052935 
  auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
Karsten Hopp 052935 
*** ../vim-7.4.408/src/config.mk.in	2014-06-12 18:03:24.936319000 +0200
Karsten Hopp 052935 
--- src/config.mk.in	2014-08-17 16:56:28.371077771 +0200
Karsten Hopp 052935 
***************
Karsten Hopp 052935 
*** 48,58 ****
Karsten Hopp 052935 
  MZSCHEME_OBJ	= @MZSCHEME_OBJ@
Karsten Hopp 052935 
  MZSCHEME_CFLAGS	= @MZSCHEME_CFLAGS@
Karsten Hopp 052935 
  MZSCHEME_PRO	= @MZSCHEME_PRO@
Karsten Hopp 052935 
! MZSCHEME_EXTRA  = @MZSCHEME_EXTRA@
Karsten Hopp 052935 
  MZSCHEME_MZC	= @MZSCHEME_MZC@
Karsten Hopp 052935
Karsten Hopp 052935 
  PERL		= @vi_cv_path_perl@
Karsten Hopp 052935 
  PERLLIB		= @vi_cv_perllib@
Karsten Hopp 052935 
  PERL_LIBS	= @PERL_LIBS@
Karsten Hopp 052935 
  SHRPENV		= @shrpenv@
Karsten Hopp 052935 
  PERL_SRC	= @PERL_SRC@
Karsten Hopp 052935 
--- 48,59 ----
Karsten Hopp 052935 
  MZSCHEME_OBJ	= @MZSCHEME_OBJ@
Karsten Hopp 052935 
  MZSCHEME_CFLAGS	= @MZSCHEME_CFLAGS@
Karsten Hopp 052935 
  MZSCHEME_PRO	= @MZSCHEME_PRO@
Karsten Hopp 052935 
! MZSCHEME_EXTRA	= @MZSCHEME_EXTRA@
Karsten Hopp 052935 
  MZSCHEME_MZC	= @MZSCHEME_MZC@
Karsten Hopp 052935
Karsten Hopp 052935 
  PERL		= @vi_cv_path_perl@
Karsten Hopp 052935 
  PERLLIB		= @vi_cv_perllib@
Karsten Hopp 052935 
+ PERL_XSUBPP	= @vi_cv_perl_xsubpp@
Karsten Hopp 052935 
  PERL_LIBS	= @PERL_LIBS@
Karsten Hopp 052935 
  SHRPENV		= @shrpenv@
Karsten Hopp 052935 
  PERL_SRC	= @PERL_SRC@
Karsten Hopp 052935 
*** ../vim-7.4.408/src/configure.in	2014-07-30 13:22:48.263621613 +0200
Karsten Hopp 052935 
--- src/configure.in	2014-08-17 16:57:11.183076219 +0200
Karsten Hopp 052935 
***************
Karsten Hopp 052935 
*** 933,938 ****
Karsten Hopp 052935 
--- 933,946 ----
Karsten Hopp 052935 
        fi
Karsten Hopp 052935 
        vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'`
Karsten Hopp 052935 
        AC_SUBST(vi_cv_perllib)
Karsten Hopp 052935 
+       vi_cv_perl_extutils=unknown_perl_extutils_path
Karsten Hopp 052935 
+       for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do
Karsten Hopp 052935 
+ 	xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp"
Karsten Hopp 052935 
+ 	if test -f "$xsubpp_path"; then
Karsten Hopp 052935 
+ 	  vi_cv_perl_xsubpp="$xsubpp_path"
Karsten Hopp 052935 
+ 	fi
Karsten Hopp 052935 
+       done
Karsten Hopp 052935 
+       AC_SUBST(vi_cv_perl_xsubpp)
Karsten Hopp 052935 
        dnl Remove "-fno-something", it breaks using cproto.
Karsten Hopp 052935 
        perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
Karsten Hopp 052935 
  	      -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//'`
Karsten Hopp 052935 
*** ../vim-7.4.408/src/auto/configure	2014-07-30 13:22:48.267621613 +0200
Karsten Hopp 052935 
--- src/auto/configure	2014-08-17 16:58:43.047072887 +0200
Karsten Hopp 052935 
***************
Karsten Hopp 052935 
*** 687,692 ****
Karsten Hopp 052935 
--- 687,693 ----
Karsten Hopp 052935 
  PERL_OBJ
Karsten Hopp 052935 
  PERL_SRC
Karsten Hopp 052935 
  shrpenv
Karsten Hopp 052935 
+ vi_cv_perl_xsubpp
Karsten Hopp 052935 
  vi_cv_perllib
Karsten Hopp 052935 
  vi_cv_path_perl
Karsten Hopp 052935 
  MZSCHEME_MZC
Karsten Hopp 052935 
***************
Karsten Hopp 052935 
*** 5604,5609 ****
Karsten Hopp 052935 
--- 5605,5618 ----
Karsten Hopp 052935 
        fi
Karsten Hopp 052935 
        vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'`
Karsten Hopp 052935
Karsten Hopp 052935 
+       vi_cv_perl_extutils=unknown_perl_extutils_path
Karsten Hopp 052935 
+       for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do
Karsten Hopp 052935 
+ 	xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp"
Karsten Hopp 052935 
+ 	if test -f "$xsubpp_path"; then
Karsten Hopp 052935 
+ 	  vi_cv_perl_xsubpp="$xsubpp_path"
Karsten Hopp 052935 
+ 	fi
Karsten Hopp 052935 
+       done
Karsten Hopp 052935 
+
Karsten Hopp 052935 
              perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
Karsten Hopp 052935 
  	      -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//'`
Karsten Hopp 052935 
              perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
Karsten Hopp 052935 
*** ../vim-7.4.408/src/version.c	2014-08-16 18:36:38.597993280 +0200
Karsten Hopp 052935 
--- src/version.c	2014-08-17 16:53:34.135084090 +0200
Karsten Hopp 052935 
***************
Karsten Hopp 052935 
*** 743,744 ****
Karsten Hopp 052935 
--- 743,746 ----
Karsten Hopp 052935 
  {   /* Add new patch number below this line */
Karsten Hopp 052935 
+ /**/
Karsten Hopp 052935 
+     409,
Karsten Hopp 052935 
  /**/
Karsten Hopp 052935
Karsten Hopp 052935
Karsten Hopp 052935 
--
Karsten Hopp 052935 
To define recursion, we must first define recursion.
Karsten Hopp 052935
Karsten Hopp 052935 
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 052935 
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 052935 
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 052935 
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation