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