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