diff options
| author | Greg Larkin <glarkin@FreeBSD.org> | 2011-05-18 20:24:24 +0000 |
|---|---|---|
| committer | Greg Larkin <glarkin@FreeBSD.org> | 2011-05-18 20:24:24 +0000 |
| commit | 8713aeb15ac6a4782f0bfb582c6efc9372c632d8 (patch) | |
| tree | 142534c1f930648dc55fdce24f3f91ccb4a2f30c /lang/eperl/files/patch-configure | |
| parent | - Update distinfo (diff) | |
- Add support for and unbreak after Perl default version bump to 5.12
- Add support for and fix compilation on Perl 5.14 after a symbol name
change
- Patch the configure script so PERL_VERSION supplies the Perl version
number directly, instead of attempting to parse the often-changed
output of "perl -v"
Reported by: pointyhat (via erwin & pav)
Notes
Notes:
svn path=/head/; revision=274276
Diffstat (limited to 'lang/eperl/files/patch-configure')
| -rw-r--r-- | lang/eperl/files/patch-configure | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/lang/eperl/files/patch-configure b/lang/eperl/files/patch-configure index 508d5b20b9a4..8f0c93111fb7 100644 --- a/lang/eperl/files/patch-configure +++ b/lang/eperl/files/patch-configure @@ -1,34 +1,42 @@ ---- configure.orig 1998-08-02 22:48:40.000000000 +0900 -+++ configure 2010-02-06 14:30:44.165551147 +0900 -@@ -571,7 +571,8 @@ +--- configure.orig 1998-08-02 09:48:40.000000000 -0400 ++++ configure 2011-05-18 14:18:27.000000000 -0400 +@@ -571,7 +571,7 @@ if test "${with_perl+set}" = set; then withval="$with_perl" perlprog=$with_perl -perlvers=`$perlprog -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'` -+perlvers=`$perlprog -v | grep "This is perl" | sed -e 's/^.* version //' -e 's/^.* v//' -e 's/ built.*//' -e 's/ with.*//'` -+perlvers=`echo ${perlvers} | sed -e 's/ (\*)//'` ++perlvers=%%PERL_VERSION%% else TMPFILE=/tmp/x.$$ -@@ -600,7 +601,7 @@ +@@ -583,7 +583,7 @@ + if test -f "$dir/$perl"; then + if test -x "$dir/$perl"; then + perl="$dir/$perl" +- version=`$perl -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'` ++ version=%%PERL_VERSION%% + versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`" + versionnum=`expr $versionnum - $c` + echo "$versionnum $version $perl" >>$TMPFILE +@@ -600,7 +600,7 @@ PATH_PERL=$perlprog echo "$ac_t""$perlprog v$perlvers" 1>&6 case $perlvers in - 5.003* | 5.004* | 5.005* | 5.006* ) -+ 5.003* | 5.004* | 5.005* | 5.006* | 5.6.* | 5.8.* | 5.10.* ) ++ 5.003* | 5.004* | 5.005* | 5.006* | 5.6.* | 5.8.* | 5.10.* | 5.12.* | 5.14.* ) ;; * ) echo "" echo "Latest Perl found on your system is $perlvers," -@@ -617,6 +618,8 @@ +@@ -617,6 +617,8 @@ perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 5.00[3-6] ) perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;; -+ 5.[68].* | 5.10.* ) ++ 5.[68].* | 5.10.* | 5.12.* | 5.14.* ) + perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/\./0/' -e 's/$/00/'` ;; * ) perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; esac -@@ -708,7 +711,9 @@ +@@ -708,7 +710,9 @@ #define HAVE_PERL_DYNALOADER 1 EOF @@ -39,7 +47,7 @@ ;; * ) rc=no -@@ -1028,7 +1033,7 @@ +@@ -1028,7 +1032,7 @@ CFLAGS="-Wall -g -ggdb3" LDFLAGS="-g -ggdb3" else @@ -48,7 +56,7 @@ LDFLAGS="-g" fi x="enabled" -@@ -1039,7 +1044,7 @@ +@@ -1039,7 +1043,7 @@ else |