Mercurial > vim
changeset 6143:de35e123e63c v7.4.409
updated for version 7.4.409
Problem: Can't build with Perl on Fedora 20.
Solution: Find xsubpp in another directory. (Michael Henry)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 17 Aug 2014 17:05:44 +0200 |
| parents | 4c08173b8b95 |
| children | 5e31d6cbc6ca |
| files | src/Makefile src/auto/configure src/config.mk.in src/configure.in src/version.c |
| diffstat | 5 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2477,7 +2477,7 @@ lintinstall: auto/if_perl.c: if_perl.xs $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ - $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ + $(PERL) $(PERL_XSUBPP) -prototypes -typemap \ $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
--- a/src/auto/configure +++ b/src/auto/configure @@ -687,6 +687,7 @@ PERL_PRO PERL_OBJ PERL_SRC shrpenv +vi_cv_perl_xsubpp vi_cv_perllib vi_cv_path_perl MZSCHEME_MZC @@ -5604,6 +5605,14 @@ fi fi vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'` + vi_cv_perl_extutils=unknown_perl_extutils_path + for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do + xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp" + if test -f "$xsubpp_path"; then + vi_cv_perl_xsubpp="$xsubpp_path" + fi + done + perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[^ ]*//'` perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
--- a/src/config.mk.in +++ b/src/config.mk.in @@ -48,11 +48,12 @@ MZSCHEME_SRC = @MZSCHEME_SRC@ MZSCHEME_OBJ = @MZSCHEME_OBJ@ MZSCHEME_CFLAGS = @MZSCHEME_CFLAGS@ MZSCHEME_PRO = @MZSCHEME_PRO@ -MZSCHEME_EXTRA = @MZSCHEME_EXTRA@ +MZSCHEME_EXTRA = @MZSCHEME_EXTRA@ MZSCHEME_MZC = @MZSCHEME_MZC@ PERL = @vi_cv_path_perl@ PERLLIB = @vi_cv_perllib@ +PERL_XSUBPP = @vi_cv_perl_xsubpp@ PERL_LIBS = @PERL_LIBS@ SHRPENV = @shrpenv@ PERL_SRC = @PERL_SRC@
--- a/src/configure.in +++ b/src/configure.in @@ -933,6 +933,14 @@ if test "$enable_perlinterp" = "yes" -o fi vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlibexp}'` AC_SUBST(vi_cv_perllib) + vi_cv_perl_extutils=unknown_perl_extutils_path + for extutils_rel_path in ExtUtils vendor_perl/ExtUtils; do + xsubpp_path="$vi_cv_perllib/$extutils_rel_path/xsubpp" + if test -f "$xsubpp_path"; then + vi_cv_perl_xsubpp="$xsubpp_path" + fi + done + AC_SUBST(vi_cv_perl_xsubpp) dnl Remove "-fno-something", it breaks using cproto. perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \ -e 'ccflags;perl_inc;print"\n"' | sed -e 's/-fno[[^ ]]*//'`