You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

36 lines
1.7 KiB

Index: Math-Pari-2.01080607/Makefile.PL
--- Math-Pari-2.01080607/Makefile.PL.orig 2014-04-24 13:43:52.000000000 +0200
+++ Math-Pari-2.01080607/Makefile.PL 2014-04-27 10:28:42.227288809 +0200
@@ -25,12 +25,13 @@
grep {/^pari_tgz=(.*?)[\/\\]?$/i and $parisrc = $1} @ARGV;
grep {/^force_download$/i and $force_download = 1} @ARGV;
grep {/^parilib=(.*)$/i and $common::parilib = $1} @ARGV;
+grep {/^parihdr=(.*)$/i and $common::parihdr = $1} @ARGV;
grep {/^version23_ok=(.*)$/i and $ok23 = $1} @ARGV;
# The REx should anchored-match versions to skip
$common::skip_versions = $ok23 ? '2\.(?:[4-9]|\d\d+)\.' : '2\.(?:[3-9]|\d\d+)\.';
-@ARGV = grep !/^((machine|paridir|pari_tgz|parilib|version23_ok)=.*|configure|force_download)$/i, @ARGV;
+@ARGV = grep !/^((machine|paridir|pari_tgz|parilib|parihdr|version23_ok)=.*|configure|force_download)$/i, @ARGV;
$paridir = find_pari_dir() unless defined $paridir or $parisrc or $force_download;
($paridir, my @patch_rc) = download_and_patch_pari($parisrc, $force_download)
@@ -53,7 +54,7 @@
EOP
if ($common::parilib) {
- $pari_version = '2001004'; # XXXX How to get a correct one?
+ $pari_version = '2003001'; # XXXX How to get a correct one?
$define = '-DNO_HIGHLEVEL_PARI';
print <<EOP;
Trying to use existing PARI library (at $common::parilib)
@@ -179,7 +180,7 @@
# This is done in Makefile in GP/PARI, and in paricfg.h without do_configure
$define .= ' -DDL_DFLT_NAME=NULL' if $common::do_configure;
-my $extra_inc = extra_includes($paridir);
+my $extra_inc = $common::parihdr . " " . extra_includes($paridir);
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile being created.