Update pari to 2.7.5.
Bug numbers refer to the BTS at http://pari.math.u-bordeaux.fr/Bugs/ Done for version 2.7.5 (released 09/11/2015): [last column crossreferences current development release 2.8.0] Fixed 1- forprime engine could skip (fast) sieve in favour of (slow) nextprime [#1711] [F113] 2- 0^[1] -> domain error [#1713] [F114] 3- memory leaks (clones) in ellchangecurve [#1716] [F115] 4- zeta inaccurate around 0 [#1714] [F116] 5- bnrrootnumber did not support the trivial character [0,..,0] [F118] 6- default(log,1) when logfile is write-protected later lead to SEGV [F119] BA 7- 2-adic gamma function: fix accuracy loss [F120] 8- A==A -> 0 for A a t_SER of huge accuracy (so that A-A overflows valuation) [#1734] [F121] XR 9- P=Pol([1,-2,12,-12,-181,-4,-6899,9780,6360,702,-45]); for(i=1,10000,setrand(i);nfdisc(P)) -> crash [#1735] [F122] 10- select(x->x,Vecsmall([1,2,3]),1) -> crash [#1737] [F123] BA 11- [libpari] RgV_to_RgX_reverse did not work if v[1] or v[2] was 0 [F125] 12- bnfinit could fail at low precision [#1736] [F126] 13- Rg_to_ff: incorrect type in zk_to_ff [#1755] [F127] BA 14- nfsubfields could fail [#1758] [F128] 15- rare SEGV in ArtinNumber [#1759] [F129] Done for version 2.7.4 (released 19/06/2015): [last column crossreferences current development release 2.8.0] Fixed 1- divisors([2,1]) -> SEGV [#1664] [F84] 2- acos([Pol(1)]) -> GC bug [#1663] [F85] 3- primes([1,Pol(2)]) -> SEGV [#1668] [F87] 4- buffer overflow after default(format,"f.precision") [F95] 5- qfminim(A, 0, ...) -> stack overflow [#1682] [F97] 6- div_scal_rfrac could create an invalid t_POL [#1651] [F99] 7- polroots(t_POL with leading coeff = 0) -> fp exception [#1690] [F100] 8- \r cannot deal with very long filenames [#1616] [F101] 9- rnfisabelian(nf, non monic t_POL) -> SEGV [#1693] [F102] 10- possibly incorrect result in nfdisc(T,listP) [F104] 11- wrong dim(Ker) returned by ZM_pivot => SEGV in Z-linear algebra routines. E.g. setrand(1);quadclassunit(-612556842419) [#1700] [F105] 12- moebius(factor(18)) -> 1 instead of 0 [#1702] [F106] 13- ispower(-167^10) => domain error [#1703] [F107] 14- ispowerful(factor(0)) != ispowerful(0) [F108] 15- expm1(2*I) => wrong result [F109] 16- gamma(1+a*x+O(x^2)) => error [#1707] [F110] 17- printsep() printed its argument in random format instead of f_RAW [F111] 18- nfdisc(x^10 - 29080*x^5 - 25772600) -> oo loop [#1710] [F112] Added ED 1- mingw64 support [A111] Done for version 2.7.3 (released 18/02/2015): [last column crossreferences current development release 2.8.0] Fixed 1- [from 2.7.2] ??bnrL1 and ??ellL1 did not work anymore 2- thue(f^e*g, ...), e even, (f,g)=1 missed solutions such that f<0 [F22] XR 3- bnrL1(bnrinit(bnfinit(x^2-168),[6,[1,1]],1)) -> bug in ArtinNumber [F55] 4- nfisincl(t_POL, t_POL) could lead to wrong negative results [F58] 5- polresultant(1+x*z^2,1+y*z^4,z) -> GC error [#1614] [F59] BA 6- ellcard over non-prime fields could return wrong results [F60] 7- [libpari] FpX_roots could produce GC errors [#1618] [F61] 8- weber(1+I) was missing its imaginary part [F62] 9- (1+I)*(1+1/2*I) => wrong result (type errors) [#1619] [F63] 10- contfracpnqn([a]) => [1,a;0,1] instead of [a,1;1,0] [F64] 11- primes([2^50, 2^50+200000]) => stack overflow [F65] 12- issquare((x+1/2)^2,&z); z => 1.0*x+0.5 instead of x+1/2 [F66] 13- possibly missing roots in nfroots (when using Trager) [F68] 14- quadray(bnf, ideal) did not work [F69] 15- thue(-14*x^3 + 10*x^2 + 63*x - 5,1) -> "short continued fraction" [F70] 16- thue(29*x^3+130*x^2-35*x-48,1) -> "round error" bug [F71] 17- T=thueinit(10*x^3+6*x^2-41*x+8,1); thue(T,8) => SEGV [#1630] [F72] 18- ellrootno(e,p = 2 or 3) when e not minimal at p => random result [F73] 19- agm(1,2+O(5)) -> SEGV [#1645] [F76] BA 20- [cygwin64] ellap(ellinit([0,0,1,-1,0]),10007) was broken [F77] 21- primes([-5,5]) -> [5] (spurious absolute values) [F78] 22- matqr([;]) -> crash [F79] 23- Fp_rem_mBarrett could return a non-normalized result [F80] p=436^56-35;Mod(271,p)^((p-1)/2) -> p+1 24- plotcopy would corrupt "string" objects (ROt_ST) [F81] BA 25- [GP] default arguments to GP functions could cause corruption [F82] VBr26- [darwin] remove obsolete linker options that cause crashes [#1623] [F83] Done for version 2.7.2 (released 19/09/2014): [last column crossreferences current development release 2.8.0] Fixed 1- gaffsg(0, t_PADIC): wrong valuation [F21] 2- (t_INTMOD with word-sized modulus)^(huge negative power) [#1584] [F24] 3- (gp -p N) or (primelimit=N in gprc_ for N >= 436273290 resulted in an incorrect primetable. N.B. Such commands are now useless: needed primes are produced dynamically anyway. [F25] 4- monomial(exact zero, d, v) returned an invalid t_POL / t_RFRAC [F26] 5- contfracpnqn(v, n) returned partial quotients p[-1]/q[-1] ... p[n-1]/q[n-1], instead of the documented p[0]/q[0] ... p[n]/q[n] [F27] 6- factor((3+4*I)/25) -> factor 2+I had 0 exponent [#1586] [F29] BA 7- iferr() could crash if some component of the t_ERROR were clones. [F31] 8- nffactor() could overflow the stack when default accuracy too low [F32] BA 9- obsolete use of E=[a1,a2,a3,a4,a6] in ellmul crashed [#1589] [F33] 10- incorrect rounding in mulrr/divrr for one-word precision reals [F34] BA 11- multiif did not handle correctly return() in conditions [#1590] [F35] 12- [0..5] -> [0,0,0,0,0] on some architectures [F36] 13- is_gener_Fp could return wrong results [F37] 14- Fq_sqrtn(t_INT,..,&zeta) could return a wrong root of 1 [F38] 15- bnfinit: SEGV due to precision issues [#1592] [F39] 16- zm_zc_mul only worked for square zm matrices [F40] 17- genus2red(0,27*x^5+97*x^4+118*x^3+60*x^2+13*x+1,3) -> bug [#1596] [F41] 18- [gphelp] oo loop when $COLUMNS too small [#1594] [F42] 19- genus2red(x,-x^6-3*x^4-10*x^2-1,3) -> impossible inverse [#1597] [F43] 20- factoru(1) returned a t_MAT instead of the expected "matsmall" [F44] 21- FpM_charpoly wrong in small characteristic [#1602] [F45] 22- when compatible = 3; series() used a random precision [F50] 23- genus2red(0,6*x^6+5*x^4+x^2+1,7) -> impossible inverse [#1597] [F51] 24- isprime() could crash on large input [#1604] [F52] 25- genus2red(x^3+1,1) -> type error [#1597] [F53] 26- gphelp did not handle === correctly [#1603] [F54] 27- FpXY_evaly() wrong when evaluating at 0 [F56] 28- [mingw] gp could crash at start up [#1607] [F57] Done for version 2.7.1 (released 16/05/2014): [last column crossreferences current development release 2.8.0] Fixed 1- make install fails on OS/X: ln -s libpari.dylib libpari.dylib fails [F1] 2- Q_pvalrem(t_FRAC) => wrong result [F2] 3- [] == 0 but []~ != 0 (now []~ == 0 as well) [#1560] [F3] BA 4- test-kernel did not work when using --mt=pthread [F4] BA 5- ellheegner was using too much memory in some case [F5] BA 6- ellap can overflow on 32-bit machine [#1558] (minimal fix) [F6] 7- nfhilbert(K,x,y, P above 2) could give wrong results [#1561] [F7] 8- gcd(1/2, 1+I*1.) -> SEGV [#1563] [F10] 9- mathnf(t_VEC) could corrupt input (change sign) [F11] 10- [libpari] RgM_transmul did not work [F12] 11- [libpari] Fq_issquare didn't support T=NULL [F13] 12- [libpari] nfpow_u didn't handle non-integral rational numbers [F14] 13- eint1(0) -> stack overflow [#1568] [F15] 14- nfroots(, t_POL with leading coeff -1) could miss solutions [F19] 15- precprime(1) -> invalid t_INT [#1576] [F20]
This commit is contained in:
wiz
parent
1d5115d08e
commit
523c10a8f1
33 changed files with 435 additions and 909 deletions
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.66 2015/08/18 07:31:12 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.67 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
DISTNAME= pari-2.3.5
|
||||
PKGREVISION= 19
|
||||
DISTNAME= pari-2.7.5
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/
|
||||
|
||||
|
|
@ -13,7 +12,7 @@ LICENSE= gnu-gpl-v2
|
|||
MAKE_JOBS_SAFE= no
|
||||
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= perl:run
|
||||
USE_TOOLS+= gmake perl:run
|
||||
USE_LANGUAGES+= c c++
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
|
||||
|
|
@ -25,6 +24,8 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1
|
|||
CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share
|
||||
|
||||
REPLACE_PERL+= src/desc/PARI/822.pm
|
||||
REPLACE_PERL+= doc/gphelp
|
||||
REPLACE_PERL+= misc/tex2mail
|
||||
|
||||
BUILD_TARGET= all
|
||||
TEST_TARGET= test-compat bench
|
||||
|
|
@ -42,6 +43,8 @@ SUBST_MESSAGE.fix-wrap= Removing TOOLS_DIR references
|
|||
SUBST_FILES.fix-wrap= */pari.cfg
|
||||
SUBST_SED.fix-wrap= -e "s,${TOOLS_DIR}/bin/,,g"
|
||||
|
||||
pre-install: replace-interpreter
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
.include "../../devel/ncurses/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
@comment $NetBSD: PLIST,v 1.10 2010/10/01 20:50:55 minskim Exp $
|
||||
bin/gp
|
||||
bin/gp-2.3
|
||||
${PLIST.doc}bin/gphelp
|
||||
bin/tex2mail
|
||||
@comment $NetBSD: PLIST,v 1.11 2016/03/03 13:28:22 wiz Exp $
|
||||
bin/gp-2.7
|
||||
include/pari/genpari.h
|
||||
include/pari/mpinl.h
|
||||
include/pari/pari.h
|
||||
include/pari/paricast.h
|
||||
include/pari/paricfg.h
|
||||
|
|
@ -13,40 +11,24 @@ include/pari/parierr.h
|
|||
include/pari/parigen.h
|
||||
include/pari/pariinl.h
|
||||
include/pari/parinf.h
|
||||
include/pari/parimt.h
|
||||
include/pari/pariold.h
|
||||
include/pari/pariport.h
|
||||
include/pari/paripriv.h
|
||||
include/pari/paristio.h
|
||||
include/pari/parisys.h
|
||||
include/pari/paritune.h
|
||||
include/pari/paritype.h
|
||||
${PLIST.nogmp}lib/libpari.la
|
||||
${PLIST.gmp}lib/libpari-gmp.la
|
||||
lib/pari/pari.cfg
|
||||
man/man1/gp.1
|
||||
man/man1/gphelp.1
|
||||
man/man1/gp-2.7.1
|
||||
man/man1/pari.1
|
||||
man/man1/tex2mail.1
|
||||
share/emacs/site-lisp/pari/pari-completion.el
|
||||
share/emacs/site-lisp/pari/pari-conf.el
|
||||
share/emacs/site-lisp/pari/pari-fontification.el
|
||||
share/emacs/site-lisp/pari/pari-help.el
|
||||
share/emacs/site-lisp/pari/pari-messages.el
|
||||
share/emacs/site-lisp/pari/pari.el
|
||||
share/emacs/site-lisp/pari/pariemacs.txt
|
||||
share/emacs/site-lisp/pari/sli-tools.el
|
||||
${PLIST.doc}share/pari/AUTHORS
|
||||
${PLIST.doc}share/pari/CHANGES
|
||||
${PLIST.doc}share/pari/COMPAT
|
||||
${PLIST.doc}share/pari/COPYING
|
||||
${PLIST.doc}share/pari/MACHINES
|
||||
${PLIST.doc}share/pari/NEW
|
||||
share/pari/PARI/822.pm
|
||||
${PLIST.doc}share/pari/README
|
||||
${PLIST.doc}share/pari/doc/Makefile
|
||||
${PLIST.doc}share/pari/doc/appa.tex
|
||||
${PLIST.doc}share/pari/doc/appb.tex
|
||||
${PLIST.doc}share/pari/doc/appc.tex
|
||||
${PLIST.doc}share/pari/doc/appd.tex
|
||||
${PLIST.doc}share/pari/doc/develop.pdf
|
||||
${PLIST.doc}share/pari/doc/develop.tex
|
||||
${PLIST.doc}share/pari/doc/libpari.pdf
|
||||
${PLIST.doc}share/pari/doc/paricfg.tex
|
||||
${PLIST.doc}share/pari/doc/parimacro.tex
|
||||
|
|
@ -80,7 +62,5 @@ share/pari/misc/color.dft
|
|||
share/pari/misc/gpalias
|
||||
share/pari/misc/gpflog
|
||||
share/pari/misc/gprc.dft
|
||||
share/pari/misc/new.dic
|
||||
share/pari/misc/pari.xpm
|
||||
share/pari/misc/xgp
|
||||
share/pari/pari.desc
|
||||
|
|
|
|||
|
|
@ -1,27 +1,24 @@
|
|||
$NetBSD: distinfo,v 1.23 2015/12/11 13:11:08 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.24 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
SHA1 (pari-2.3.5.tar.gz) = f211ccfe42a4b18dbcde832dfd1ece6f477f4966
|
||||
RMD160 (pari-2.3.5.tar.gz) = 488adf3af5398d0ab5390eb86b65cd79bd1044c5
|
||||
SHA512 (pari-2.3.5.tar.gz) = 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca
|
||||
Size (pari-2.3.5.tar.gz) = 2018097 bytes
|
||||
SHA1 (patch-aa) = 34efbc67afe5a98874c4fb3f18f4591bfa859d1f
|
||||
SHA1 (patch-ab) = b008e8c3388fe7dae4eecbb6613408492ba03e14
|
||||
SHA1 (patch-ac) = a53784be5a94a289f86e1e6bae108adecd2d01c3
|
||||
SHA1 (patch-ad) = 5399688168b6f55073a460459fb3a89971583a6d
|
||||
SHA1 (patch-ae) = 34e174cf1c97ee8b627691f3a5bf19fbbea43324
|
||||
SHA1 (patch-af) = 985b3a35f4c69124336c23c9c78690eb7e7d1567
|
||||
SHA1 (patch-ag) = 8c50e5b01832bc876874d51df02905dddb7839f3
|
||||
SHA1 (patch-ah) = 3febc677f1b94a9b3f4dec79388fdb8f77fa184f
|
||||
SHA1 (patch-ai) = 19b1f467ee0e534c19cce5768de070950e147c67
|
||||
SHA1 (patch-aj) = 9231890613515ceb2c7018189dc549872f04a14d
|
||||
SHA1 (patch-ak) = 622a06c67fd16c61ca8219c01e7f9dc9de202df4
|
||||
SHA1 (patch-al) = 4b9fe2464fb1136449ab3f46dcd743e937db470f
|
||||
SHA1 (patch-am) = 09e158e5cd3a680d786aa876ce66d034df0c3b86
|
||||
SHA1 (patch-an) = 4e1f9c8e0c63e2f1922bb8b181212b3e09c56ce6
|
||||
SHA1 (patch-ao) = 44bf077f1585e20277dcd42a7c5fd38d12b19af5
|
||||
SHA1 (patch-ap) = 21a20b68b589f8be3036d1f2f9c4b2a7f43210a8
|
||||
SHA1 (patch-config_get_fltk) = 2c2aa271fad5880a44b2df70a7143d2aea690ca0
|
||||
SHA1 (patch-src_headers_paridecl.h) = ee02e487807d8ed1c1a11268965ade76a2f80cf2
|
||||
SHA1 (patch-src_language_anal.c) = d0028a51e8ef14cae766cb881fcfce82cec0346f
|
||||
SHA1 (patch-src_language_es.c) = 27c286da66ce1a2fc6e5179cfb3f4e222984813d
|
||||
SHA1 (patch-src_modules_mpqs.c) = 3dd164e5c686fd2eb8317569cf05906a4c527721
|
||||
SHA1 (pari-2.7.5.tar.gz) = ca6f6bc57d2028df5a5bddd3810a82cb05d139f2
|
||||
RMD160 (pari-2.7.5.tar.gz) = b5cc28e5382cc31d7da7dcb9258a7099d31872ce
|
||||
SHA512 (pari-2.7.5.tar.gz) = 1dcc60d3b9ab6b46fd8e5d0e28e5e37369da0eb872869788b6ac7f92ce69a21789c114cd432cf8416014e4359db5c23816b49a26ad59965f51092d30b8af9d41
|
||||
Size (pari-2.7.5.tar.gz) = 3159103 bytes
|
||||
SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157
|
||||
SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea
|
||||
SHA1 (patch-config_Makefile.SH) = d1754104438aa0a4d6f86c809d81300ecb3aa3f2
|
||||
SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a
|
||||
SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44
|
||||
SHA1 (patch-config_get__X11) = 0bb8f77d5c5adfb29f89ad95ead1b5726c1a3918
|
||||
SHA1 (patch-config_get__archos) = f813a841f4795df30ef0b908263bea3d90e42b86
|
||||
SHA1 (patch-config_get__dlld) = 2e356255cb84d43f9859a66907bf8ed335639d78
|
||||
SHA1 (patch-config_get__install) = 0cccbb2dcf875b287787d88265730fdbeb5abd42
|
||||
SHA1 (patch-config_get__ld) = 3a0539211311c2686f3c8b1b289038ad54397134
|
||||
SHA1 (patch-config_get__libpth) = dc9e0178f41125396d51663e02f221fa95f24343
|
||||
SHA1 (patch-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee
|
||||
SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111
|
||||
SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8
|
||||
SHA1 (patch-src_language_compile.c) = ea356968c3e5f8d599a61d4413bf04552b673ea6
|
||||
SHA1 (patch-src_language_es.c) = ee470a5e050839573e213d7644d1e182fb3a4f0f
|
||||
SHA1 (patch-src_language_parsec.h) = 5cf4772aa2c9d7c912e68f2638bbc99de2d388a6
|
||||
SHA1 (patch-src_modules_mpqs.c) = 54adabc5bffe06ebbb79f3dd6366a4e7e219a676
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.11 2014/02/25 09:32:57 obache Exp $
|
||||
# $NetBSD: options.mk,v 1.12 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.pari
|
||||
PKG_SUPPORTED_OPTIONS= doc gmp x11
|
||||
|
|
@ -12,6 +12,7 @@ PLIST_VARS+= doc
|
|||
.if !empty(PKG_OPTIONS:Mdoc)
|
||||
BUILD_DEPENDS+= tex-amsfonts>=3.0:../../fonts/tex-amsfonts
|
||||
BUILD_DEPENDS+= tex-pdftex>=1.40.11:../../print/tex-pdftex
|
||||
BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
|
||||
PLIST.doc= yes
|
||||
BUILD_TARGET+= doc
|
||||
INSTALL_TARGET+= install-doc
|
||||
|
|
|
|||
21
math/pari/patches/patch-Configure
Normal file
21
math/pari/patches/patch-Configure
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
$NetBSD: patch-Configure,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- Configure.orig 2015-06-02 14:03:57.000000000 +0000
|
||||
+++ Configure
|
||||
@@ -119,14 +119,14 @@ fi
|
||||
. ./get_static # static
|
||||
# For dynamic linking, before and after installing
|
||||
runpath=\"$libdir\"
|
||||
-LDDYN="-lpari"
|
||||
+LDDYN="-Wl,-R$libdir -L$libdir -lpari"
|
||||
# get_modld needs $includedir from get_install, static, and LDDYN
|
||||
. ./get_modld # $_modld_list
|
||||
|
||||
# Which copy, SHELL ?
|
||||
case "$osname" in
|
||||
os2) ln_s=cp; make_sh=sh;;
|
||||
- *) ln_s="ln -s"; make_sh="/bin/sh";;
|
||||
+ *) ln_s="ln -sf"; make_sh="/bin/sh";;
|
||||
esac
|
||||
####################### CONFIGURE - CLEANUP #################################
|
||||
rm -f gmon.out # created by Configure -pg
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.7 2010/02/06 10:37:06 sno Exp $
|
||||
|
||||
--- Configure.orig 2008-01-16 15:57:54.000000000 +0000
|
||||
+++ Configure
|
||||
@@ -36,7 +36,7 @@ cd $config_dir
|
||||
. ./get_PATH
|
||||
# We might need the following :
|
||||
echo Looking for some tools first ...
|
||||
-list='ld zcat gzip ranlib perl emacs'
|
||||
+list='ld zcat ranlib emacs'
|
||||
pathspace=`echo $PATH | sed -e "s/$dir_sep/ /g" | sed -e 's,\\\\,/,g'`
|
||||
|
||||
for file in $list; do
|
||||
@@ -49,6 +49,7 @@ for file in $list; do
|
||||
esac
|
||||
done
|
||||
if test -z "$zcat" -a -n "$gzip"; then zcat="$gzip -dc"; fi
|
||||
+perl=${PERL5}
|
||||
|
||||
####################### CONFIGURE - ARCHITECTURE ############################
|
||||
. ./get_archos # arch, osname
|
||||
@@ -101,14 +102,14 @@ fi
|
||||
. ./get_static # static
|
||||
# For dynamic linking, before and after installing
|
||||
runpath="$libdir"
|
||||
-LDDYN="-L$libdir -lpari"
|
||||
+LDDYN="-Wl,-R$libdir -L$libdir -lpari"
|
||||
# get_modld needs $includedir from get_install, static, and LDDYN
|
||||
. ./get_modld # $_modld_list
|
||||
|
||||
# Which copy, SHELL ?
|
||||
case "$osname" in
|
||||
os2) ln_s=cp; make_sh=sh;;
|
||||
- *) ln_s="ln -s"; make_sh="/bin/sh";;
|
||||
+ *) ln_s="ln -sf"; make_sh="/bin/sh";;
|
||||
esac
|
||||
####################### CONFIGURE - CLEANUP #################################
|
||||
rm -f gmon.out # created by Configure -pg
|
||||
@@ -172,14 +173,14 @@ if test "$objdir" != "$mkobjdir"; then
|
||||
fi
|
||||
|
||||
case $ans in
|
||||
-y) if (cd $objdir; make gp); then
|
||||
+y) if (cd $objdir; ${MAKE} gp); then
|
||||
echo $n "Shall we install the files where they belong (y/n)? $c"
|
||||
dflt=n; rep='y n'; . $config_dir/myread
|
||||
case $ans in
|
||||
- y) make install;;
|
||||
- n) echo "Ok. Type \"${cdobjdir}make install\" when you are ready";;
|
||||
+ y) ${MAKE} install;;
|
||||
+ n) echo "Ok. Type \"${cdobjdir}${MAKE} install\" when you are ready";;
|
||||
esac
|
||||
fi;;
|
||||
-n) echo "Ok. Type \"${cdobjdir}make install\" when you are ready";;
|
||||
+n) echo "Ok. Type \"${cdobjdir}${MAKE} install\" when you are ready";;
|
||||
esac
|
||||
echo 'Bye !'
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
|
||||
--- config/get_archos.orig 2008-01-16 15:57:13.000000000 +0000
|
||||
+++ config/get_archos
|
||||
@@ -26,7 +26,7 @@ if test "$fastread" != yes; then
|
||||
==========================================================================
|
||||
I know of the following Operating Systems
|
||||
EOM
|
||||
- rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix';
|
||||
+ rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly';
|
||||
. ./display
|
||||
echo $n ..."Any of these apply ? $c"
|
||||
dflt=$osname; . ./myread
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.3 2010/02/06 10:37:06 sno Exp $
|
||||
|
||||
--- config/get_readline.orig 2008-01-16 15:57:14.000000000 +0000
|
||||
+++ config/get_readline
|
||||
@@ -33,21 +33,11 @@ if test -n "$readline"; then
|
||||
$cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\
|
||||
";;
|
||||
*) incpth="$incpth\
|
||||
- /usr/local/include/readline\
|
||||
- /usr/include/readline\
|
||||
- /opt/include/readline\
|
||||
- /opt/local/include/readline\
|
||||
- /opt/gnu/include/readline\
|
||||
- /usr/unsupported/include/readline\
|
||||
- /usr/local/include\
|
||||
- /usr/include\
|
||||
- /opt/include\
|
||||
- /opt/local/include\
|
||||
- /opt/gnu/include\
|
||||
+ $LOCALBASE/include\
|
||||
";;
|
||||
esac
|
||||
pth="$with_readline_include $readline_add $incpth"
|
||||
- x=`./locate 'readline.h' '' $pth`
|
||||
+ x=`./locate 'readline/readline.h' '' $pth`
|
||||
CPPF_defined=
|
||||
case $x in
|
||||
?:/*|/*) rl_include=`dirname $x`
|
||||
@@ -111,22 +101,11 @@ if test -n "$readline"; then
|
||||
lib=$rl_fullname; sym=tgetent; . ./locatesymbol
|
||||
need_tgetent="$try"
|
||||
if test -n "$need_tgetent"; then
|
||||
- opth=$pth; pth="$with_ncurses_lib $libpth"
|
||||
- lib=ncurses; . ./locatelib
|
||||
- if test -n "$try"; then # ncurses found. Does it contain tgetent ?
|
||||
- lib=$try; . ./locatesymbol
|
||||
- fi
|
||||
- pth=$opth
|
||||
- if test -n "$try"; then
|
||||
- rl_ncurses=$ncurses
|
||||
- need_tgetent=
|
||||
- else # give termcap a try
|
||||
lib=termcap; . ./locatelib
|
||||
if test -n "$try"; then
|
||||
rl_termcap=$termcap
|
||||
need_tgetent=
|
||||
fi
|
||||
- fi
|
||||
fi
|
||||
# Readline -- CFLAGS
|
||||
if (echo $rl_include | grep "readline$" > /dev/null); then
|
||||
@@ -135,7 +114,7 @@ if test -n "$readline"; then
|
||||
else # in case headers are not installed correctly
|
||||
RLINCLUDE="-I$rl_include -DREADLINE_LIBRARY"
|
||||
fi
|
||||
- RLLIBS="-L$readline -lreadline"
|
||||
+ RLLIBS="-Wl,-R$readline -L$readline -lreadline"
|
||||
if test -n "$rl_ncurses"; then
|
||||
echo ..."Library ncurses needed by readline"
|
||||
RLLIBS="$RLLIBS -L$rl_ncurses -lncurses"
|
||||
|
|
@ -1,349 +0,0 @@
|
|||
$NetBSD: patch-ai,v 1.4 2010/10/01 20:50:55 minskim Exp $
|
||||
|
||||
--- config/Makefile.SH.orig 2010-01-09 17:59:48.000000000 +0000
|
||||
+++ config/Makefile.SH
|
||||
@@ -70,7 +70,7 @@ plotrunpath=
|
||||
case "$which_graphic_lib" in
|
||||
*X11*)
|
||||
PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
|
||||
- PLOTLIBS="$PLOTLIBS $X11_LIBS"
|
||||
+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
|
||||
plotrunpath=$X11
|
||||
graph="plotX $graph"
|
||||
;;
|
||||
@@ -110,25 +110,12 @@ if test -n "$runpathprefix"; then
|
||||
RUNPTH=`$config_dir/ldflags "$LDneedsWl" "$runpathprefix$TOP/$objdir$dir_sep$tmp"`
|
||||
fi
|
||||
|
||||
-if test -z "$DLLD"; then
|
||||
- exec="gp-sta"; static=y
|
||||
-else
|
||||
- exec="gp-sta gp-dyn"
|
||||
-fi
|
||||
case "$sizeof_long" in
|
||||
4) numbits=32;;
|
||||
8) numbits=64;;
|
||||
esac
|
||||
dotest="env \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
|
||||
-if test -z "$emacs"; then
|
||||
- install_emacs_files=
|
||||
-else
|
||||
- install_emacs_files=install_emacs_files
|
||||
-fi
|
||||
-case "$static" in
|
||||
- n) dft=dyn; libdft=lib-dyn;;
|
||||
- y) dft=sta; libdft= ;;
|
||||
-esac
|
||||
+install_emacs_files=install_emacs_files
|
||||
|
||||
CPPFLAGS="-I. -I$src/headers"
|
||||
if test "$has_dlopen" = builtin; then
|
||||
@@ -153,16 +140,14 @@ AR = ar
|
||||
SIZEOF_LONG= $sizeof_long
|
||||
|
||||
CC_FLAVOR =
|
||||
-CC = $CC \$(CC_FLAVOR)
|
||||
+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
|
||||
CPPFLAGS = $CPPFLAGS
|
||||
CFLAGS = $CFLAGS
|
||||
DLCFLAGS = $DLCFLAGS
|
||||
LD_FLAVOR = \$(CC_FLAVOR)
|
||||
-LD = $LD \$(LD_FLAVOR)
|
||||
+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
|
||||
LDFLAGS = $LDFLAGS
|
||||
DLLD_FLAVOR = \$(LD_FLAVOR)
|
||||
-DLLD = $DLLD \$(DLLD_FLAVOR)
|
||||
-DLLDFLAGS = $DLLDFLAGS
|
||||
EXTRADLLDFLAGS = $EXTRADLLDFLAGS
|
||||
|
||||
# HIGHLY EXPERIMENTAL (only tested with gmp-4.0 on ix86 and Ultra).
|
||||
@@ -179,29 +164,19 @@ EXTRADLLDFLAGS = $EXTRADLLDFLAGS
|
||||
#the following line
|
||||
#GMPO2 = \$(GMP)/sparcv9.o
|
||||
|
||||
-_O = .o
|
||||
-_A = .a
|
||||
+_O = .lo
|
||||
+_A = .la
|
||||
LIB_PREFIX = $lib_prefix
|
||||
-DLLIB_PREFIX = $dllib_prefix
|
||||
-LIBPARI_BASE = $libpari_base
|
||||
-LIBPARI = \$(LIB_PREFIX)pari
|
||||
-DLLIBPARI = \$(DLLIB_PREFIX)pari
|
||||
-LIBPARI_STA = \$(LIBPARI)\$(_A)
|
||||
-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX
|
||||
-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
|
||||
-LIBPARI_DYN = \$(SOLIBPARI)$sodest
|
||||
-LIBPARI_SONAME= \$(SOLIBPARI)$soname
|
||||
+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A)
|
||||
DL_DFLT_NAME = $DL_DFLT_NAME
|
||||
|
||||
EXPORT_FILE = $export_file
|
||||
EXPORT_CREATE = $export_create
|
||||
EXPORT_LIB = $export_lib
|
||||
EXPORT_LIB_CREATE = $export_lib_create
|
||||
-DLLD_IGNORE = $dlld_ignore
|
||||
|
||||
RUNPTH = $RUNPTH
|
||||
RUNPTH_FINAL = $RUNPTH_FINAL
|
||||
-LDDYN = $LDDYN
|
||||
LIBS = $LIBS
|
||||
|
||||
RM = rm -f
|
||||
@@ -226,8 +201,10 @@ MISCDIR = \$(DATADIR)/misc
|
||||
DOCDIR = \$(DATADIR)/doc
|
||||
|
||||
INSTALL = $cfg/install
|
||||
-INSTALL_PROGRAM = \$(INSTALL)
|
||||
-INSTALL_DATA = \$(INSTALL) -m 644
|
||||
+INSTALL_PROGRAM = \$(BSD_INSTALL_PROGRAM)
|
||||
+INSTALL_SCRIPT = \$(BSD_INSTALL_SCRIPT)
|
||||
+INSTALL_DATA = \$(BSD_INSTALL_DATA)
|
||||
+INSTALL_MAN = \$(BSD_INSTALL_MAN)
|
||||
|
||||
# Readline
|
||||
RLINCLUDE = $RLINCLUDE
|
||||
@@ -239,7 +216,7 @@ QTDIR = "$QTDIR"
|
||||
MOC = \$(QTDIR)/bin/moc
|
||||
PLOTCFLAGS = $PLOTCFLAGS
|
||||
PLOTLIBS = $PLOTLIBS
|
||||
-CPLUSPLUS = g++
|
||||
+CPLUSPLUS = \$(LIBTOOL) --mode=compile $CXX \$(CXX_FLAVOR)
|
||||
|
||||
FLTKDIR = "$FLTKDIR"
|
||||
|
||||
@@ -254,21 +231,16 @@ DOTEST=$dotest
|
||||
OBJS = $OBJS
|
||||
OBJSGP = $OBJSGP
|
||||
|
||||
-gp: gp-$dft ../gp$suffix$exe_suff $libdft
|
||||
+all: \$(LIBPARI)
|
||||
|
||||
-../gp$suffix$exe_suff: gp-$dft
|
||||
- -\$(RM) \$@
|
||||
- -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@
|
||||
+lib: \$(LIBPARI)
|
||||
|
||||
-all: $exec lib-sta
|
||||
+\$(LIBPARI): \$(OBJS)
|
||||
+ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0
|
||||
|
||||
-lib-sta: \$(LIBPARI_STA)
|
||||
-lib-dyn: \$(LIBPARI_DYN)
|
||||
-
|
||||
-\$(LIBPARI_STA): $add_funclist \$(OBJS)
|
||||
- -\$(RM) \$@
|
||||
- \$(AR) r \$@ \$(OBJS)
|
||||
- -$ranlib \$@
|
||||
+gp: \$(OBJSGP) \$(LIBPARI)
|
||||
+ \$(RM) \$@
|
||||
+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
|
||||
|
||||
kerntest\$(_O): $src/test/kerntest.c
|
||||
\$(CC) -c \$(CFLAGS) -I$src/language \$(CPPFLAGS) -o \$@ $src/test/kerntest.c
|
||||
@@ -297,11 +269,6 @@ tune-dyn: tune.o \$(LIBPARI_DYN)
|
||||
tune-sta: tune.o \$(LIBPARI_STA)
|
||||
\$(LD) \$(LDFLAGS) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(LIBS)
|
||||
|
||||
-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
|
||||
- \$(RM) \$@
|
||||
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
|
||||
- $postconfig gp-sta
|
||||
-
|
||||
cleanemacs:
|
||||
\$(RM) $emx/*.elc
|
||||
cleantest:
|
||||
@@ -316,7 +283,7 @@ clean: cleanobj cleantest cleanemacs cle
|
||||
.headers: $HEADERS
|
||||
@touch \$@
|
||||
|
||||
-install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
|
||||
+install: install-lib install-include install-bin install-man install-misc install-examples install-cfg install-data
|
||||
|
||||
install-include:
|
||||
-mkdir -p \$(INCLUDEDIR)/pari
|
||||
@@ -324,23 +291,11 @@ install-include:
|
||||
\$(INSTALL_DATA) \$\$i \$(INCLUDEDIR)/pari; done
|
||||
-for i in $headerlist; do \\
|
||||
\$(INSTALL_DATA) $src/headers/\$\$i.h \$(INCLUDEDIR)/pari; done
|
||||
- -\$(RM) \$(INCLUDEDIR)/pari/genpari.h
|
||||
-\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
|
||||
|
||||
-install-bin: install-bin-$dft
|
||||
-
|
||||
-install-bin-dyn: gp-dyn
|
||||
+install-bin: gp
|
||||
-mkdir -p \$(BINDIR)
|
||||
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
|
||||
- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
|
||||
- $postconfig \$(BINDIR)/gp-$version$exe_suff
|
||||
- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
-
|
||||
-install-bin-sta: gp-sta
|
||||
- -mkdir -p \$(BINDIR)
|
||||
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
- \$(INSTALL_PROGRAM) gp-sta$exe_suff \$(BINDIR)/gp-$version$exe_suff
|
||||
+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff
|
||||
-\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
# Can't strip it if we want install() to work on OSF.
|
||||
# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version
|
||||
@@ -348,24 +303,22 @@ install-bin-sta: gp-sta
|
||||
|
||||
install-man::
|
||||
-mkdir -p \$(MANDIR)
|
||||
- -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
|
||||
- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
|
||||
- \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
|
||||
+ \$(INSTALL_MAN) $doc/gphelp.1 \$(MANDIR)
|
||||
+ \$(INSTALL_MAN) $doc/gp.1 \$(MANDIR)
|
||||
-\$(LN) gp.1 \$(MANDIR)/pari.1
|
||||
- -\$(LN) gp-$version.1 \$(MANDIR)/gp.1
|
||||
|
||||
install-misc: $install_emacs_files
|
||||
-mkdir -p \$(MISCDIR) \$(BINDIR)
|
||||
- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
|
||||
- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
|
||||
- \$(INSTALL_DATA) $misc/README \$(MISCDIR)
|
||||
- \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
|
||||
- \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
|
||||
- \$(INSTALL_PROGRAM) $misc/gpflog \$(MISCDIR)
|
||||
- \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR)
|
||||
- \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR)
|
||||
- \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR)
|
||||
- \$(INSTALL_PROGRAM) $misc/xgp \$(MISCDIR)
|
||||
+ \$(INSTALL_SCRIPT) $misc/tex2mail \$(BINDIR)
|
||||
+ \$(INSTALL_MAN) $doc/tex2mail.1 \$(MANDIR)
|
||||
+ \$(INSTALL_DATA) $misc/README \$(MISCDIR)
|
||||
+ \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
|
||||
+ \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
|
||||
+ \$(INSTALL_SCRIPT) $misc/gpflog \$(MISCDIR)
|
||||
+ \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR)
|
||||
+ \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR)
|
||||
+ \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR)
|
||||
+ \$(INSTALL_SCRIPT) $misc/xgp \$(MISCDIR)
|
||||
|
||||
install-cfg::
|
||||
-mkdir -p \$(SYSDATADIR)
|
||||
@@ -377,8 +330,15 @@ install-cfg::
|
||||
|
||||
install-doc::
|
||||
-mkdir -p \$(BINDIR) \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) ../AUTHORS \$(DATADIR)
|
||||
+ -\$(INSTALL_DATA) ../CHANGES \$(DATADIR)
|
||||
+ -\$(INSTALL_DATA) ../COMPAT \$(DATADIR)
|
||||
+ -\$(INSTALL_DATA) ../COPYING \$(DATADIR)
|
||||
+ -\$(INSTALL_DATA) ../MACHINES \$(DATADIR)
|
||||
+ -\$(INSTALL_DATA) ../NEW \$(DATADIR)
|
||||
+ -\$(INSTALL_DATA) ../README \$(DATADIR)
|
||||
-cd $doc; \$(MAKE) all
|
||||
- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR)
|
||||
+ -\$(INSTALL_SCRIPT) $doc/gphelp \$(BINDIR)
|
||||
-\$(INSTALL_DATA) $doc/Makefile \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR)
|
||||
@@ -395,11 +355,10 @@ install-doc::
|
||||
-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/paricfg.tex \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/libpari.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/users.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/refcard.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/refcard.ps \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/libpari.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/users.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/refcard.pdf \$(DOCDIR)
|
||||
|
||||
install-examples:
|
||||
-mkdir -p \$(EXDIR)
|
||||
@@ -426,20 +385,9 @@ install-data:
|
||||
done; \
|
||||
fi
|
||||
|
||||
-install-lib-sta: \$(LIBPARI_STA)
|
||||
+install-lib: \$(LIBPARI)
|
||||
-mkdir -p \$(LIBDIR)
|
||||
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
|
||||
- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
|
||||
-
|
||||
-install-lib-dyn-base:
|
||||
- -mkdir -p \$(LIBDIR)
|
||||
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
|
||||
- \$(INSTALL_PROGRAM) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_DYN)
|
||||
-install-lib-dyn-link: install-lib-dyn-base
|
||||
- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
|
||||
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME);\
|
||||
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
|
||||
-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
|
||||
+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
|
||||
|
||||
pariinl.h: parilvl0.h parilvl1.h
|
||||
cat parilvl0.h parilvl1.h > pariinl.h
|
||||
@@ -462,63 +410,13 @@ dotest-$i::
|
||||
EOT
|
||||
done
|
||||
|
||||
-if test -z "$DLLD"; then
|
||||
- cat >> $file << EOT
|
||||
-
|
||||
-\$(LIBPARI_DYN)::
|
||||
- @echo "Configure could not find a way to build a shared library on this machine"
|
||||
-
|
||||
-EOT
|
||||
-else
|
||||
- if test -n "$export_file"; then
|
||||
- cat >> $file << EOT
|
||||
-
|
||||
-EXPORT_FILE_BASE = $src/systems/os2/pari.def.base
|
||||
-VERSION_VERBOSE = $pari_release_verbose
|
||||
-
|
||||
-\$(EXPORT_FILE): \$(OBJS) \$(EXPORT_FILE_BASE)
|
||||
- cat \$(EXPORT_FILE_BASE) | sed 's/<DLL_BASE>/\$(DLLIBPARI)/' | sed 's/<VENDOR>/pari.math.u-bordeaux.fr\//' | sed 's/<VERSION>/\$(VERSION_VERBOSE)/' | sed 's/<DESCR>/GP\/PARI compiled with \$(CFLAGS)/' > \$@
|
||||
- \$(EXPORT_CREATE) \$(OBJS) >> \$@
|
||||
-
|
||||
-\$(DLLIBPARI)\$(_A): \$(EXPORT_FILE)
|
||||
- \$(EXPORT_LIB_CREATE) -o \$@ \$(EXPORT_FILE)
|
||||
-
|
||||
-EOT
|
||||
- fi
|
||||
- cat >> $file << EOT
|
||||
-
|
||||
-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
|
||||
- \$(RM) \$@
|
||||
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
|
||||
- $postconfig gp-dyn
|
||||
-
|
||||
-\$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
|
||||
- -\$(RM) \$(LIBPARI_DYN)
|
||||
- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(EXPORT_FILE)
|
||||
- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SO)"; then \
|
||||
- \$(RM) \$(LIBPARI_SO);\
|
||||
- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SO); fi
|
||||
- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SONAME)"; then \
|
||||
- \$(RM) \$(LIBPARI_SONAME);\
|
||||
- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SONAME); fi
|
||||
-EOT
|
||||
-fi
|
||||
-
|
||||
-if test -n "$emacs"; then
|
||||
- cat >> $file << EOT
|
||||
-elc:
|
||||
- @echo "Byte-Compiling elisp files..."
|
||||
- -cd $emx; $emacs -batch \
|
||||
- --eval '(setq load-path (append (list ".") load-path))' \
|
||||
- -f batch-byte-compile *.el
|
||||
-
|
||||
-$install_emacs_files: elc
|
||||
+cat >> $file << EOT
|
||||
+$install_emacs_files:
|
||||
-mkdir -p \$(EMACSDIR)
|
||||
-cd $emx; for f in *.elc *.el pariemacs.txt; do \
|
||||
\$(INSTALL_DATA) \$\$f \$(EMACSDIR); \
|
||||
done
|
||||
EOT
|
||||
-fi
|
||||
|
||||
if test -n "$add_funclist"; then
|
||||
cat >> $file << EOT
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-aj,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
|
||||
--- src/headers/paristio.h.orig 2008-01-16 15:55:40.000000000 +0000
|
||||
+++ src/headers/paristio.h
|
||||
@@ -15,6 +15,8 @@ Foundation, Inc., 59 Temple Place - Suit
|
||||
|
||||
/* This file contains memory and I/O management definitions */
|
||||
|
||||
+#include <fcntl.h>
|
||||
+
|
||||
typedef struct {
|
||||
long s, us;
|
||||
} pari_timer;
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
$NetBSD: patch-ak,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
|
||||
--- src/test/dotest.orig 2010-02-05 10:43:24.000000000 +0000
|
||||
+++ src/test/dotest
|
||||
@@ -44,14 +44,8 @@ else
|
||||
fi
|
||||
$RM -f $file_bench
|
||||
|
||||
-dotestSUF=${dotestSUF:-"sta dyn"}
|
||||
-for arg in $dotestSUF; do
|
||||
- case "$arg" in
|
||||
- sta|dyn) if test $x $execdir/gp-$arg; then SUF="$SUF $arg"; fi ;;
|
||||
- esac
|
||||
-done
|
||||
file_test=gp.out
|
||||
-for suf in $SUF; do eval time$suf=0 files$suf=; done
|
||||
+eval time=0 files=
|
||||
for testdata in $testlist; do
|
||||
O=$IFS;IFS=_;set $testdata;IFS=$O;testname=$1;testmul=$2
|
||||
file_in=$testdir/in/$testname
|
||||
@@ -65,44 +59,37 @@ for testdata in $testlist; do
|
||||
|
||||
testmul=${testmul:-1000}
|
||||
wr "* Testing $testname $c"
|
||||
- for suf in $SUF; do
|
||||
- wr " for gp-$suf..$c"
|
||||
- case "$suf" in
|
||||
- exe) file_diff=$testname.dif;;
|
||||
- *) file_diff=$testname-$suf.dif
|
||||
- gp=$execdir/gp-$suf;;
|
||||
- esac
|
||||
+ wr " for gp..$c"
|
||||
+ file_diff=$testnamef.dif
|
||||
+ gp=$execdir/gp
|
||||
$gp -q --test < $file_in > $file_test 2>&1
|
||||
diff -c $file_out $file_test > $file_diff
|
||||
pat=`grep "^[-+!] " $file_diff | grep -v "Total time"`
|
||||
time=`${tail}2 $file_test | sed -n 's,.*Total time spent: \(.*\),\1,p'`
|
||||
if test -n "$time"; then
|
||||
- eval t='$'time$suf
|
||||
+ eval t='$'time
|
||||
if test -n "$exprbug"; then
|
||||
t=`expr $time \'\*\' $testmul / 1000 + $t`
|
||||
else
|
||||
t=`expr $time '*' $testmul / 1000 + $t`
|
||||
fi
|
||||
- eval time$suf=$t
|
||||
+ eval time=$t
|
||||
fi
|
||||
if test -z "$pat"; then
|
||||
wr "TIME=$time";
|
||||
else
|
||||
eval BUG$suf=BUG
|
||||
- eval files$suf=\"'$'files$suf $file_diff\"
|
||||
+ eval files=\"'$'files $file_diff\"
|
||||
wr "BUG [${time:-0}]"
|
||||
fi
|
||||
- done
|
||||
wrln
|
||||
done
|
||||
$RM -f $file_test
|
||||
BUG=
|
||||
-for suf in $SUF; do
|
||||
- B=`eval echo '$'BUG$suf`; BUG="$BUG$B"
|
||||
- t=`eval echo '$'time$suf`
|
||||
+ B=`eval echo '$'BUG`; BUG="$BUG$B"
|
||||
+ t=`eval echo '$'time`
|
||||
if test -n "$B"; then B=' [BUG]'; fi
|
||||
- wrln "+++$B Total bench for gp-$suf is $t"
|
||||
-done
|
||||
+ wrln "+++$B Total bench for gp is $t"
|
||||
if test -z "$BUG"; then exit 0; fi
|
||||
|
||||
pwd=`pwd`
|
||||
@@ -110,18 +97,16 @@ wrln
|
||||
wrln "PROBLEMS WERE NOTED. The following files list them in diff format: "
|
||||
wrln "Directory: $pwd"
|
||||
bugp=; buge=;
|
||||
-for suf in $SUF; do
|
||||
- B=`eval echo '$'BUG$suf`; BUG="$BUG$B"
|
||||
+ B=`eval echo '$'BUG`; BUG="$BUG$B"
|
||||
if test -n "$B"; then
|
||||
- flist=`eval echo '$'files$suf`
|
||||
+ flist=`eval echo '$'files`
|
||||
for f in $flist; do
|
||||
wrln " $f"
|
||||
case "$f" in
|
||||
- *program*) bugp="$suf$bugp";;
|
||||
+ *program*) bugp="$bugp";;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
-done
|
||||
|
||||
case "x$bugp" in
|
||||
x) file_diff=;;
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
$NetBSD: patch-al,v 1.4 2010/10/01 20:50:55 minskim Exp $
|
||||
|
||||
--- config/DOC_Make.SH.orig 2008-03-31 11:43:59.000000000 +0000
|
||||
+++ config/DOC_Make.SH
|
||||
@@ -8,11 +8,11 @@ MACROS= paricfg.tex parimacro.tex
|
||||
USERS_TEX=\$(MACROS) users.tex usersch1.tex usersch2.tex usersch3.tex
|
||||
PARI_TEX=\$(MACROS) libpari.tex appa.tex appb.tex appc.tex usersch4.tex usersch5.tex
|
||||
|
||||
-doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
|
||||
+docdvi: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
|
||||
docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps
|
||||
-docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
|
||||
+all doc docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
|
||||
|
||||
-.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
|
||||
+.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html .ps .pdf .dvi .idx .std
|
||||
|
||||
paricfg.tex: paricfg.tex.in
|
||||
sed -e 's/@version@/$version.$patch/'\\
|
||||
@@ -20,50 +20,50 @@ paricfg.tex: paricfg.tex.in
|
||||
-e 's!@libdir@!$libdir!'\\
|
||||
-e 's!@datadir@!$datadir!' paricfg.tex.in > \$@
|
||||
|
||||
-%.pdf: %.tex \$(MACROS)
|
||||
- pdftex \$<
|
||||
+.tex.pdf: \$*.tex \$(MACROS)
|
||||
+ \$(PDFTEX) \$<
|
||||
|
||||
-%.dvi: %.tex \$(MACROS)
|
||||
+.tex.dvi: \$*.tex \$(MACROS)
|
||||
tex \$<
|
||||
|
||||
libpari.pdf: \$(PARI_TEX) \$(MACROS)
|
||||
-rm -f libpari.std
|
||||
- pdftex libpari
|
||||
- pdftex libpari
|
||||
- make libpari.std; pdftex libpari; rm -f libpari.std
|
||||
+ \$(PDFTEX) libpari
|
||||
+ \$(PDFTEX) libpari
|
||||
+ \$(MAKE) libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
|
||||
libpari.dvi: \$(PARI_TEX) \$(MACROS)
|
||||
-rm -f libpari.std
|
||||
tex libpari
|
||||
tex libpari
|
||||
- make libpari.std; tex libpari; rm -f libpari.std
|
||||
+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std
|
||||
|
||||
develop.pdf: develop.tex \$(MACROS)
|
||||
-rm -f develop.std
|
||||
- pdftex develop
|
||||
- pdftex develop
|
||||
- make develop.std; pdftex develop; rm -f develop.std
|
||||
+ \$(PDFTEX) develop
|
||||
+ \$(PDFTEX) develop
|
||||
+ \$(MAKE) develop.std; \$(PDFTEX) develop; rm -f develop.std
|
||||
develop.dvi: develop.tex \$(MACROS)
|
||||
-rm -f develop.std
|
||||
tex develop
|
||||
tex develop
|
||||
- make develop.std; tex develop; rm -f develop.std
|
||||
+ \$(MAKE) develop.std; tex develop; rm -f develop.std
|
||||
|
||||
tutorial.pdf: tutorial.tex \$(MACROS)
|
||||
-rm -f tutorial.std
|
||||
- pdftex tutorial
|
||||
- pdftex tutorial
|
||||
+ \$(PDFTEX) tutorial
|
||||
+ \$(PDFTEX) tutorial
|
||||
tutorial.dvi: tutorial.tex \$(MACROS)
|
||||
-rm -f tutorial.std
|
||||
tex tutorial
|
||||
tex tutorial
|
||||
|
||||
-%.ps: %.dvi
|
||||
+.dvi.ps: \$*.dvi
|
||||
dvips \$< -o \$@
|
||||
|
||||
refcard.ps: refcard.dvi
|
||||
dvips -t landscape -t a4 refcard.dvi -o \$@
|
||||
|
||||
-%.std: %.idx
|
||||
+.idx.std: \$*.idx
|
||||
sed -e 's/!\([1-9]\)!/!00\1!/'\\
|
||||
-e 's/!\([1-9][0-9]\)!/!0\1!/'\\
|
||||
-e 's/\\\\EFF {}/f/g'\\
|
||||
@@ -74,13 +74,13 @@ users.dvi: \$(USERS_TEX)
|
||||
-rm -f users.std
|
||||
tex users
|
||||
tex users
|
||||
- make users.std; tex users; rm -f users.std
|
||||
+ \$(MAKE) users.std; tex users; rm -f users.std
|
||||
|
||||
users.pdf: \$(USERS_TEX)
|
||||
-rm -f users.std
|
||||
- pdftex users
|
||||
- pdftex users
|
||||
- make users.std; pdftex users; rm -f users.std
|
||||
+ \$(PDFTEX) users
|
||||
+ \$(PDFTEX) users
|
||||
+ \$(MAKE) users.std; \$(PDFTEX) users; rm -f users.std
|
||||
|
||||
gpman: gp.1
|
||||
nroff -man gp.1 | unix2dos -ascii > gp.man
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
$NetBSD: patch-an,v 1.3 2010/02/12 18:18:29 sno Exp $
|
||||
|
||||
--- src/language/anal.h.orig 2008-06-10 15:43:14.000000000 +0000
|
||||
+++ src/language/anal.h
|
||||
@@ -61,7 +61,6 @@ void changevalue_p(entree *ep, GEN x);
|
||||
void changevalue(entree *ep, GEN val);
|
||||
entree *do_alias(entree *ep);
|
||||
int is_identifier(char *s);
|
||||
-entree *is_entry_intern(char *s, entree **table, long *hash);
|
||||
long is_keyword_char(char c);
|
||||
char *readstring(char *src, char *s);
|
||||
long loop_break(void);
|
||||
@@ -80,23 +79,15 @@ void hit_return(void);
|
||||
extern char *gp_function_name;
|
||||
extern int (*whatnow_fun)(char *, int);
|
||||
extern void (*sigint_fun)(void);
|
||||
-extern void *foreignHandler;
|
||||
-extern GEN (*foreignExprHandler)(char*);
|
||||
-extern char foreignExprSwitch;
|
||||
-extern entree * (*foreignAutoload)(char*, long);
|
||||
-extern void (*foreignFuncFree)(entree *);
|
||||
extern int (*default_exception_handler)(long);
|
||||
|
||||
extern const long functions_tblsz; /* hashcodes table size */
|
||||
/* Variables containing the list of PARI functions */
|
||||
-extern entree **functions_hash; /* functions hashtable */
|
||||
extern entree **members_hash; /* members hashtable */
|
||||
-extern entree functions_basic[];
|
||||
|
||||
/* Variables containing the list of specific GP functions */
|
||||
extern entree functions_gp[];
|
||||
extern entree gp_member_list[];
|
||||
-extern entree functions_highlevel[];
|
||||
|
||||
/* Variables containing the list of old PARI fonctions (up to 1.39.15) */
|
||||
extern entree **funct_old_hash; /* hashtable */
|
||||
@@ -118,13 +109,6 @@ enum { RET_GEN, RET_INT, RET_LONG, RET_V
|
||||
extern void *PARI_stack_limit;
|
||||
#endif
|
||||
|
||||
-/* entrees */
|
||||
-#define EpVALENCE(ep) ((ep)->valence & 0xFF)
|
||||
-#define EpSTATIC(ep) ((ep)->valence & 0x100)
|
||||
-#define EpSETSTATIC(ep) ((ep)->valence |= 0x100)
|
||||
-#define EpPREDEFINED(ep) (EpVALENCE(ep) < EpUSER)
|
||||
-enum { EpUSER = 100, EpNEW, EpALIAS, EpVAR, EpGVAR, EpMEMBER, EpINSTALL };
|
||||
-
|
||||
/* defaults */
|
||||
char* get_sep(const char *t);
|
||||
long get_int(const char *s, long dflt);
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
$NetBSD: patch-ao,v 1.3 2010/02/12 18:18:29 sno Exp $
|
||||
|
||||
--- src/headers/paripriv.h.orig 2008-03-31 11:43:59.000000000 +0000
|
||||
+++ src/headers/paripriv.h
|
||||
@@ -850,4 +850,24 @@ GEN kbesselnew(GEN n, GEN z, long pr
|
||||
GEN polylogd0(long m, GEN x, long flag, long prec);
|
||||
GEN twistpartialzeta(GEN p, GEN q, long f, long c, GEN va, GEN cff);
|
||||
|
||||
+/* Something from src/languages/anal.[ch] to support Math::Pari */
|
||||
+
|
||||
+/* entrees */
|
||||
+#define EpVALENCE(ep) ((ep)->valence & 0xFF)
|
||||
+#define EpSTATIC(ep) ((ep)->valence & 0x100)
|
||||
+#define EpSETSTATIC(ep) ((ep)->valence |= 0x100)
|
||||
+#define EpPREDEFINED(ep) (EpVALENCE(ep) < EpUSER)
|
||||
+enum { EpUSER = 100, EpNEW, EpALIAS, EpVAR, EpGVAR, EpMEMBER, EpINSTALL };
|
||||
+
|
||||
+extern entree **functions_hash; /* functions hashtable */
|
||||
+extern entree functions_basic[];
|
||||
+extern entree functions_highlevel[];
|
||||
+extern entree *is_entry_intern(char *s, entree **table, long *hash);
|
||||
+
|
||||
+extern void *foreignHandler;
|
||||
+extern GEN (*foreignExprHandler)(char*);
|
||||
+extern char foreignExprSwitch;
|
||||
+extern entree * (*foreignAutoload)(char*, long);
|
||||
+extern void (*foreignFuncFree)(entree *);
|
||||
+
|
||||
ENDEXTERN
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ap,v 1.3 2010/03/13 22:16:34 schmonz Exp $
|
||||
|
||||
--- config/TOP_Make.SH.orig 2008-10-23 16:30:37.000000000 +0000
|
||||
+++ config/TOP_Make.SH
|
||||
@@ -40,7 +40,7 @@ dft target::
|
||||
@echo "Available extra tests: test-all $top_test_extra"
|
||||
|
||||
all::
|
||||
- @-cd doc && \$(MAKE) doc
|
||||
+# @-cd doc && \$(MAKE) doc
|
||||
@\$(MAKE) gp
|
||||
|
||||
gp bench test-kernel test-all $top_test_extra $top_dotest_extra install cleanobj cleantest install-bin install-doc install-data install-lib-sta install-bin-sta dobench tune::
|
||||
15
math/pari/patches/patch-config_DOC__Make.SH
Normal file
15
math/pari/patches/patch-config_DOC__Make.SH
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-config_DOC__Make.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
Rules for dvi/ps are broken, just generate PDFs to work around this.
|
||||
|
||||
--- config/DOC_Make.SH.orig 2014-07-30 13:38:47.000000000 +0000
|
||||
+++ config/DOC_Make.SH
|
||||
@@ -21,7 +21,7 @@ MACROS= paricfg.tex parimacro.tex
|
||||
USERS_TEX=\$(MACROS) appa.tex users.tex usersch1.tex usersch2.tex usersch3.tex
|
||||
PARI_TEX=\$(MACROS) libpari.tex appb.tex appd.tex usersch4.tex usersch5.tex usersch6.tex usersch7.tex
|
||||
|
||||
-doc all: develop.dvi libpari.dvi parallel.dvi users.dvi refcard.ps tutorial.dvi
|
||||
+doc all: develop.pdf libpari.pdf parallel.pdf users.pdf refcard.pdf tutorial.pdf
|
||||
docps: develop.ps libpari.ps parallel.ps refcard.ps tutorial.ps users.ps INSTALL.ps
|
||||
docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
|
||||
|
||||
240
math/pari/patches/patch-config_Makefile.SH
Normal file
240
math/pari/patches/patch-config_Makefile.SH
Normal file
|
|
@ -0,0 +1,240 @@
|
|||
$NetBSD: patch-config_Makefile.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/Makefile.SH.orig 2014-12-13 20:52:52.000000000 +0000
|
||||
+++ config/Makefile.SH
|
||||
@@ -52,8 +52,6 @@ case "$osname" in
|
||||
dlld_ignore=- ;;
|
||||
mingw)
|
||||
export_file='$(LIBPARI).def';;
|
||||
- darwin)
|
||||
- ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";;
|
||||
esac
|
||||
case "$osname" in
|
||||
mingw|cygwin)
|
||||
@@ -93,7 +91,7 @@ plotrunpath=
|
||||
case "$which_graphic_lib" in
|
||||
*X11*)
|
||||
PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
|
||||
- PLOTLIBS="$PLOTLIBS $X11_LIBS"
|
||||
+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
|
||||
plotrunpath=$X11
|
||||
graph="plotX $graph"
|
||||
;;
|
||||
@@ -134,20 +132,11 @@ if test -n "$runpathprefix"; then
|
||||
RUNPTH=`$config_dir/ldflags "$LDneedsWl" $runpathprefix\\\$\(TOPDIR\)/$objdir$dir_sep"$tmp"`
|
||||
fi
|
||||
|
||||
-if test -z "$DLLD"; then
|
||||
- exec="gp-sta"; static=y
|
||||
-else
|
||||
- exec="gp-sta gp-dyn"
|
||||
-fi
|
||||
case "$sizeof_long" in
|
||||
4) numbits=32;;
|
||||
8) numbits=64;;
|
||||
esac
|
||||
dotest="env \"RUNTEST=\$(RUNTEST)\" \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
|
||||
-case "$static" in
|
||||
- n) dft=dyn; libdft=lib-dyn;;
|
||||
- y) dft=sta; libdft= ;;
|
||||
-esac
|
||||
|
||||
CPPFLAGS="-I. -I$src/headers"
|
||||
if test "$has_dlopen" = builtin; then
|
||||
@@ -176,16 +165,16 @@ RANLIB = ranlib
|
||||
SIZEOF_LONG= $sizeof_long
|
||||
|
||||
CC_FLAVOR =
|
||||
-CC = $CC \$(CC_FLAVOR)
|
||||
+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
|
||||
CPPFLAGS = $CPPFLAGS
|
||||
CFLAGS = $CFLAGS
|
||||
DLCFLAGS = $DLCFLAGS
|
||||
KERNELCFLAGS = $KERNELCFLAGS
|
||||
LD_FLAVOR = \$(CC_FLAVOR)
|
||||
-LD = $LD \$(LD_FLAVOR)
|
||||
+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
|
||||
LDFLAGS = $LDFLAGS
|
||||
DLLD_FLAVOR = \$(LD_FLAVOR)
|
||||
-DLLD = $DLLD \$(DLLD_FLAVOR)
|
||||
+DLLD = \$(LIBTOOL) --mode=link $DLLD \$(DLLD_FLAVOR)
|
||||
DLLDFLAGS = $DLLDFLAGS
|
||||
EXTRADLLDFLAGS = $EXTRADLLDFLAGS
|
||||
RUNTEST = $RUNTEST
|
||||
@@ -204,18 +193,12 @@ RUNTEST = $RUNTEST
|
||||
#the following line
|
||||
#GMPO2 = \$(GMP)/sparcv9.o
|
||||
|
||||
-_O = .o
|
||||
-_A = .a
|
||||
+_O = .lo
|
||||
+_A = .la
|
||||
LIB_PREFIX = $lib_prefix
|
||||
DLLIB_PREFIX = $dllib_prefix
|
||||
-LIBPARI_BASE = $libpari_base
|
||||
-LIBPARI = \$(LIB_PREFIX)pari
|
||||
-DLLIBPARI = \$(DLLIB_PREFIX)pari
|
||||
-LIBPARI_STA = \$(LIBPARI)\$(_A)
|
||||
-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX
|
||||
-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
|
||||
-LIBPARI_DYN = \$(SOLIBPARI)$sodest
|
||||
-LIBPARI_SONAME= \$(SOLIBPARI)$soname
|
||||
+LIBPARI_BASE = $eibpari_base
|
||||
+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A)
|
||||
DL_DFLT_NAME = $DL_DFLT_NAME
|
||||
|
||||
LD_INSTALL_NAME = $ld_install_name
|
||||
@@ -289,21 +272,15 @@ OBJSGP = $OBJSGP
|
||||
|
||||
.PHONY: gp dft clean
|
||||
|
||||
-gp: gp-$dft ../gp$suffix$exe_suff $libdft
|
||||
-
|
||||
-../gp$suffix$exe_suff: gp-$dft
|
||||
- -\$(RM) \$@
|
||||
- -\$(LN) $ln_objdir/gp-$dft \$@
|
||||
-
|
||||
-all: $exec lib-sta
|
||||
+gp: \$(OBJSGP) \$(LIBPARI)
|
||||
+ \$(RM) \$@
|
||||
+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
|
||||
|
||||
-lib-sta: \$(LIBPARI_STA)
|
||||
-lib-dyn: \$(LIBPARI_DYN)
|
||||
+all: gp \$(LIBPARI)
|
||||
+lib: \$(LIBPARI)
|
||||
|
||||
-\$(LIBPARI_STA): $add_funclist \$(OBJS)
|
||||
- -\$(RM) \$@
|
||||
- \$(AR) r \$@ \$(OBJS)
|
||||
- -\$(RANLIB) \$@
|
||||
+\$(LIBPARI): \$(OBJS)
|
||||
+ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) \$(GMPLIBS) --version-info 0:0
|
||||
|
||||
kerntest\$(_O): $src/test/kerntest.c
|
||||
\$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c
|
||||
@@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN)
|
||||
tune-sta: tune\$(_O) \$(LIBPARI_STA)
|
||||
\$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS)
|
||||
|
||||
-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
|
||||
- \$(RM) \$@
|
||||
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS)
|
||||
- $postconfig gp-sta
|
||||
-
|
||||
cleantest:
|
||||
\$(RM) *.dif gp.out io-testfile pari.ps
|
||||
cleanobj:
|
||||
@@ -364,7 +336,7 @@ clean: cleanall
|
||||
.headers: $HEADERS
|
||||
@touch \$@
|
||||
|
||||
-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg
|
||||
+install-nodata: install-lib install-include install-bin install-man install-misc install-examples install-cfg
|
||||
|
||||
install: install-nodata install-data
|
||||
|
||||
@@ -377,37 +349,19 @@ install-include:
|
||||
-\$(RM) \$(INCLUDEDIR)/pari/genpari.h
|
||||
-\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
|
||||
|
||||
-install-bin: install-bin-$dft
|
||||
-
|
||||
-install-bin-dyn: gp-dyn install-lib-dyn
|
||||
+install-bin: gp
|
||||
-mkdir -p \$(BINDIR)
|
||||
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff -L\$(LIBDIR) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(LDDYN) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
|
||||
- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
|
||||
- -cd \$(BINDIR); $postconfig gp-$version$exe_suff
|
||||
- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
-
|
||||
-install-bin-sta: gp-sta
|
||||
- -mkdir -p \$(BINDIR)
|
||||
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
- \$(INSTALL_PROGRAM) gp-sta \$(BINDIR)/gp-$version$exe_suff
|
||||
- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
|
||||
-# Can't strip it if we want install() to work on OSF.
|
||||
-# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version
|
||||
- -cd \$(BINDIR); $postconfig gp-$version$exe_suff
|
||||
+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff
|
||||
|
||||
install-man::
|
||||
-mkdir -p \$(MANDIR)
|
||||
-\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
|
||||
- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
|
||||
\$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
|
||||
-\$(LN) gp.1 \$(MANDIR)/pari.1
|
||||
-\$(LN) gp-$version.1 \$(MANDIR)/gp.1
|
||||
|
||||
install-misc:
|
||||
-mkdir -p \$(MISCDIR) \$(BINDIR)
|
||||
- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
|
||||
- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
|
||||
\$(INSTALL_DATA) $misc/README \$(MISCDIR)
|
||||
\$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
|
||||
\$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
|
||||
@@ -426,7 +380,6 @@ install-cfg::
|
||||
install-doc::
|
||||
-mkdir -p \$(BINDIR) \$(DOCDIR)
|
||||
-cd $doc; \$(MAKE) all
|
||||
- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR)
|
||||
-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/appb.tex \$(DOCDIR)
|
||||
@@ -443,12 +396,11 @@ install-doc::
|
||||
-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
|
||||
-\$(INSTALL_DATA) $doc/paricfg.tex \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/develop.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/libpari.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/users.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/refcard.dvi \$(DOCDIR)
|
||||
- -\$(INSTALL_DATA) $doc/refcard.ps \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/develop.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/libpari.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/users.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
|
||||
+ -\$(INSTALL_DATA) $doc/refcard.pdf \$(DOCDIR)
|
||||
|
||||
install-docpdf::
|
||||
-mkdir -p \$(BINDIR) \$(DOCDIR)
|
||||
@@ -483,23 +435,9 @@ install-data:
|
||||
done; \
|
||||
fi
|
||||
|
||||
-install-lib-sta: \$(LIBPARI_STA)
|
||||
- -mkdir -p \$(LIBDIR)
|
||||
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
|
||||
- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
|
||||
-
|
||||
-install-lib-dyn-base:
|
||||
+install-lib: \$(LIBPARI)
|
||||
-mkdir -p \$(LIBDIR)
|
||||
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
|
||||
- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBDIR)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE) \$(LD_INSTALL_NAME)
|
||||
- $install_implib
|
||||
-
|
||||
-install-lib-dyn-link: install-lib-dyn-base
|
||||
- -if test "\$(LIBPARI_DYN)" != "\$(LIBDIR)/\$(LIBPARI_SO)"; then \
|
||||
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
|
||||
- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
|
||||
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME); fi
|
||||
-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
|
||||
+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
|
||||
|
||||
nsis: gp
|
||||
-cd $doc; \$(MAKE) docpdf
|
||||
@@ -595,11 +533,6 @@ EOT
|
||||
fi
|
||||
cat >> $file << EOT
|
||||
|
||||
-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
|
||||
- \$(RM) \$@
|
||||
- \$(LD) -o \$@ -L\$(TOPLDDYN) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
|
||||
- $postconfig gp-dyn
|
||||
-
|
||||
\$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
|
||||
-\$(RM) \$(LIBPARI_DYN)
|
||||
\$(DLLD_IGNORE)\$(DLLD) -o \$(TOPLDDYN)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE)
|
||||
12
math/pari/patches/patch-config_TOP__Make.SH
Normal file
12
math/pari/patches/patch-config_TOP__Make.SH
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
$NetBSD: patch-config_TOP__Make.SH,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/TOP_Make.SH.orig 2014-07-30 13:38:47.000000000 +0000
|
||||
+++ config/TOP_Make.SH
|
||||
@@ -40,7 +40,6 @@ dft target::
|
||||
|
||||
all::
|
||||
@\$(MAKE) gp
|
||||
- @-cd doc && \$(MAKE) doc
|
||||
|
||||
gp bench test-kernel test-all install cleanall cleanobj cleantest nsis install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
|
||||
@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-aa,v 1.13 2010/02/06 10:37:06 sno Exp $
|
||||
$NetBSD: patch-config_get__PATH,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_PATH.orig 2008-01-16 15:57:16.000000000 +0000
|
||||
--- config/get_PATH.orig 2011-09-22 20:02:11.000000000 +0000
|
||||
+++ config/get_PATH
|
||||
@@ -4,35 +4,7 @@ if test -z "$OS2_SHELL"; then dir_sep=':
|
||||
pth="\
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
$NetBSD: patch-af,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
$NetBSD: patch-config_get__X11,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_X11.orig 2008-01-16 15:57:17.000000000 +0000
|
||||
--- config/get_X11.orig 2014-03-25 08:59:21.000000000 +0000
|
||||
+++ config/get_X11
|
||||
@@ -10,20 +10,7 @@ cd ..; rm -rf $tdir
|
||||
@@ -10,21 +10,8 @@ cd ..; rm -rf $tdir
|
||||
# Check xmkmf answer
|
||||
# X11 -- Headers
|
||||
if test ! -f $Xincroot/X11/Xos.h; then
|
||||
x11pth="\
|
||||
- x11pth="$addlib64\
|
||||
- /usr/openwin/share/lib\
|
||||
- /usr/openwin/lib\
|
||||
- /usr/X11R6/lib /usr/X11R5/lib /usr/X11R4/lib\
|
||||
|
|
@ -20,6 +21,7 @@ $NetBSD: patch-af,v 1.2 2010/02/06 10:37:06 sno Exp $
|
|||
- /usr/lib\
|
||||
- /usr/local/lib\
|
||||
- /usr/athena/lib\
|
||||
+ x11pth="\
|
||||
+ $X11BASE/lib\
|
||||
";
|
||||
pth=`echo $x11pth | sed 's,/lib,/include,g'`
|
||||
13
math/pari/patches/patch-config_get__archos
Normal file
13
math/pari/patches/patch-config_get__archos
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-config_get__archos,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_archos.orig 2011-09-22 20:02:11.000000000 +0000
|
||||
+++ config/get_archos
|
||||
@@ -26,7 +26,7 @@ if test "$fastread" != yes; then
|
||||
==========================================================================
|
||||
I know of the following Operating Systems
|
||||
EOM
|
||||
- rep='os2 freebsd netbsd cygwin linux mingw gnu gnukfreebsd hpux aix osf1 solaris sunos nextstep concentrix irix';
|
||||
+ rep='os2 freebsd netbsd cygwin linux mingw gnu gnukfreebsd hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly';
|
||||
. ./display
|
||||
echo $n ..."Any of these apply ? $c"
|
||||
dflt=$osname; . ./myread
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ag,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
$NetBSD: patch-config_get__dlld,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_dlld.orig 2009-09-19 12:01:14.000000000 +0000
|
||||
--- config/get_dlld.orig 2015-03-18 10:33:24.000000000 +0000
|
||||
+++ config/get_dlld
|
||||
@@ -9,7 +9,7 @@ DLSUFFIX=so
|
||||
soname=.$soname_num
|
||||
|
|
@ -11,18 +11,18 @@ $NetBSD: patch-ag,v 1.2 2010/02/06 10:37:06 sno Exp $
|
|||
case $pari_release_verbose in
|
||||
*STABLE*) sodest=.$version.$patch;; # released version
|
||||
*DEVELOPMENT*) sodest=.$patch.0.0;; # unstable version
|
||||
@@ -67,6 +67,7 @@ if test -n "$DLLD"; then
|
||||
@@ -76,6 +76,7 @@ if test -n "$DLLD"; then
|
||||
aix) DLLDFLAGS='-r' ;;
|
||||
darwin) DLLD=; DLLDFLAGS='-dylib -flat_namespace -undefined suppress' ;;
|
||||
darwin) DLLDFLAGS="-compatibility_version $compat_ver -current_version $num_ver" ;;
|
||||
freebsd) DLLDFLAGS='-Bshareable -x' ;;
|
||||
+ dragonfly*) DLLDFLAGS='-Bshareable -x' ;;
|
||||
hpux) DLLDFLAGS='-b' ;;
|
||||
irix) DLLDFLAGS='-shared -elf -no_unresolved -all' ;;
|
||||
osf1) DLLDFLAGS='-shared' ;;
|
||||
@@ -91,7 +92,7 @@ if test -n "$DLLD"; then
|
||||
DLLDFLAGS="-shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
|
||||
@@ -107,7 +108,7 @@ if test -n "$DLLD"; then
|
||||
fi
|
||||
case "$osname" in
|
||||
# Beware: will run through 'eval' [ hence ${...} instead of \$(...) ]
|
||||
- gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
|
||||
+ dragonfly*|gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
|
||||
esac
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ah,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
$NetBSD: patch-config_get__install,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_install.orig 2008-01-16 15:57:11.000000000 +0000
|
||||
--- config/get_install.orig 2014-07-30 13:38:47.000000000 +0000
|
||||
+++ config/get_install
|
||||
@@ -23,7 +23,7 @@ fi
|
||||
echo $n "...for architecture-independent files (share-prefix) ? $c"
|
||||
|
|
@ -8,6 +8,6 @@ $NetBSD: patch-ah,v 1.2 2010/02/06 10:37:06 sno Exp $
|
|||
|
||||
-dfltman=$share_prefix/man/man1
|
||||
+dfltman=$prefix/man/man1
|
||||
dfltemacs=$share_prefix/emacs/site-lisp/pari
|
||||
dfltdata=$share_prefix/pari
|
||||
|
||||
echo "Installation directories for:"
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-am,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
$NetBSD: patch-config_get__ld,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_ld.orig 2008-01-16 15:56:58.000000000 +0000
|
||||
--- config/get_ld.orig 2011-09-22 20:02:11.000000000 +0000
|
||||
+++ config/get_ld
|
||||
@@ -58,7 +58,7 @@ if test "$GNULDused" = yes; then
|
||||
@@ -70,7 +70,7 @@ if test "$GNULDused" = yes; then
|
||||
runpathprefix='-rpath '
|
||||
else # guess...
|
||||
case "$osname" in
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ad,v 1.2 2010/02/06 10:37:06 sno Exp $
|
||||
$NetBSD: patch-config_get__libpth,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- config/get_libpth.orig 2008-01-16 15:56:55.000000000 +0000
|
||||
--- config/get_libpth.orig 2014-03-25 08:59:21.000000000 +0000
|
||||
+++ config/get_libpth
|
||||
@@ -1,7 +1,3 @@
|
||||
-case "$sizeof_long" in
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-config_get_fltk,v 1.1 2011/12/10 23:53:34 marino Exp $
|
||||
|
||||
--- config/get_fltk.orig 2008-03-31 11:43:59.000000000 +0000
|
||||
+++ config/get_fltk
|
||||
@@ -30,6 +30,6 @@ if test -n "$with_fltk"; then
|
||||
case "$osname" in
|
||||
cygwin) FLTK_LIBS="-lgdi32 -lole32 -luuid -lwsock32 -lsupc++" ;;
|
||||
darwin) FLTK_LIBS="-framework Carbon -lsupc++" ;;
|
||||
- *) FLTK_LIBS="$X11_LIBS" ;;
|
||||
+ *) FLTK_LIBS="$X11_LIBS -lstdc++" ;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-src_headers_paridecl.h,v 1.1 2015/01/23 15:07:53 joerg Exp $
|
||||
$NetBSD: patch-src_headers_paridecl.h,v 1.2 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- src/headers/paridecl.h.orig 2015-01-22 19:57:35.000000000 +0000
|
||||
--- src/headers/paridecl.h.orig 2015-05-27 15:40:13.000000000 +0000
|
||||
+++ src/headers/paridecl.h
|
||||
@@ -264,7 +264,7 @@ GEN readseq(char *t);
|
||||
long manage_var(long n, entree *ep);
|
||||
void name_var(long n, char *s);
|
||||
@@ -1165,7 +1165,7 @@ GEN* safelistel(GEN x, long l);
|
||||
GEN* safegcoeff(GEN x, long a, long b);
|
||||
GEN strntoGENstr(const char *s, long n0);
|
||||
GEN strtoGENstr(const char *s);
|
||||
-GEN strtoi(char *s);
|
||||
+GEN pari_strtoi(char *s);
|
||||
GEN strtor(char *s, long prec);
|
||||
-GEN strtoi(const char *s);
|
||||
+GEN pari_strtoi(const char *s);
|
||||
GEN strtor(const char *s, long prec);
|
||||
GEN type0(GEN x);
|
||||
|
||||
|
|
|
|||
13
math/pari/patches/patch-src_headers_paristio.h
Normal file
13
math/pari/patches/patch-src_headers_paristio.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-src_headers_paristio.h,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- src/headers/paristio.h.orig 2014-09-15 11:32:55.000000000 +0000
|
||||
+++ src/headers/paristio.h
|
||||
@@ -13,6 +13,8 @@ Foundation, Inc., 51 Franklin Street, Fi
|
||||
|
||||
/* This file contains memory and I/O management definitions */
|
||||
|
||||
+#include <fcntl.h>
|
||||
+
|
||||
typedef struct {
|
||||
long s, us;
|
||||
} pari_timer;
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-src_language_anal.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
|
||||
$NetBSD: patch-src_language_anal.c,v 1.2 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- src/language/anal.c.orig 2015-01-22 19:57:33.000000000 +0000
|
||||
--- src/language/anal.c.orig 2014-10-01 14:57:39.000000000 +0000
|
||||
+++ src/language/anal.c
|
||||
@@ -2520,7 +2520,7 @@ int_read(char **s)
|
||||
@@ -496,7 +496,7 @@ int_read(const char **s)
|
||||
}
|
||||
|
||||
GEN
|
||||
-strtoi(char *s) { return int_read(&s); }
|
||||
+pari_strtoi(char *s) { return int_read(&s); }
|
||||
-strtoi(const char *s) { return int_read(&s); }
|
||||
+pari_strtoi(const char *s) { return int_read(&s); }
|
||||
|
||||
GEN
|
||||
strtor(char *s, long PREC)
|
||||
GEN
|
||||
strtor(const char *s, long prec)
|
||||
|
|
|
|||
13
math/pari/patches/patch-src_language_compile.c
Normal file
13
math/pari/patches/patch-src_language_compile.c
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-src_language_compile.c,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- src/language/compile.c.orig 2015-03-18 10:33:24.000000000 +0000
|
||||
+++ src/language/compile.c
|
||||
@@ -1915,7 +1915,7 @@ compilenode(long n, int mode, long flag)
|
||||
op_push(OCpushreal, data_push(strntoGENstr(tree[n].str,tree[n].len)),n);
|
||||
break;
|
||||
case CSTint:
|
||||
- op_push(OCpushgen, data_push(strtoi((char*)tree[n].str)),n);
|
||||
+ op_push(OCpushgen, data_push(pari_strtoi((char*)tree[n].str)),n);
|
||||
compilecast(n,Ggen, mode);
|
||||
break;
|
||||
case CSTstr:
|
||||
|
|
@ -1,10 +1,8 @@
|
|||
$NetBSD: patch-src_language_es.c,v 1.1 2015/12/11 13:11:08 wiz Exp $
|
||||
$NetBSD: patch-src_language_es.c,v 1.2 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
Remove fgets() indirection to fix build with USE_FORTIFY.
|
||||
|
||||
--- src/language/es.c.orig 2008-03-31 11:43:58.000000000 +0000
|
||||
--- src/language/es.c.orig 2015-09-26 23:11:11.000000000 +0000
|
||||
+++ src/language/es.c
|
||||
@@ -215,7 +215,6 @@ gp_read_stream_buf(FILE *fi, Buffer *b)
|
||||
@@ -243,7 +243,6 @@ gp_read_stream_buf(FILE *fi, Buffer *b)
|
||||
init_filtre(&F, b);
|
||||
|
||||
IM.file = fi;
|
||||
|
|
@ -12,12 +10,12 @@ Remove fgets() indirection to fix build with USE_FORTIFY.
|
|||
IM.getline= &file_input;
|
||||
IM.free = 0;
|
||||
return input_loop(&F,&IM);
|
||||
@@ -309,7 +308,7 @@ file_input(char **s0, int junk, input_me
|
||||
*s0 = b->buf + used0;
|
||||
}
|
||||
@@ -337,7 +336,7 @@ file_getline(Buffer *b, char **s0, input
|
||||
/* # of chars read by fgets is an int; be careful */
|
||||
read = minuu(left, MAX);
|
||||
s = b->buf + used;
|
||||
- if (! IM->fgets(s, left, IM->file))
|
||||
+ if (! fgets(s, left, IM->file))
|
||||
return first? NULL: *s0; /* EOF */
|
||||
- if (! IM->fgets(s, (int)read, IM->file)) return **s0? *s0: NULL; /* EOF */
|
||||
+ if (! fgets(s, (int)read, IM->file)) return **s0? *s0: NULL; /* EOF */
|
||||
|
||||
l = strlen(s); first = 0;
|
||||
l = strlen(s);
|
||||
if (l+1 < read || s[l-1] == '\n') return *s0; /* \n */
|
||||
|
|
|
|||
13
math/pari/patches/patch-src_language_parsec.h
Normal file
13
math/pari/patches/patch-src_language_parsec.h
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-src_language_parsec.h,v 1.1 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- src/language/parsec.h.orig 2014-07-30 13:38:47.000000000 +0000
|
||||
+++ src/language/parsec.h
|
||||
@@ -203,7 +203,7 @@ newintnode(struct node_loc *loc)
|
||||
if (loc->end-loc->start<=(long)(1+LOG10_2*BITS_IN_LONG))
|
||||
{
|
||||
pari_sp ltop=avma;
|
||||
- GEN g=strtoi(loc->start);
|
||||
+ GEN g=pari_strtoi(loc->start);
|
||||
long s;
|
||||
avma=ltop;
|
||||
if (signe(g)==0) return newnode(Fsmall,0,-1,loc);
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
|
||||
$NetBSD: patch-src_modules_mpqs.c,v 1.2 2016/03/03 13:28:22 wiz Exp $
|
||||
|
||||
--- src/modules/mpqs.c.orig 2015-01-22 19:57:31.000000000 +0000
|
||||
--- src/modules/mpqs.c.orig 2014-09-15 11:32:55.000000000 +0000
|
||||
+++ src/modules/mpqs.c
|
||||
@@ -2345,7 +2345,7 @@ mpqs_combine_large_primes(mpqs_handle_t
|
||||
@@ -2215,7 +2215,7 @@ mpqs_combine_large_primes(mpqs_handle_t
|
||||
*f = gerepileuptoint(av0, inv_q);
|
||||
return c;
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
|
|||
av2 = avma; /* preserve inv_q and Y1 */
|
||||
|
||||
while (fgets(buf, MPQS_STRING_LENGTH, COMB))
|
||||
@@ -2371,7 +2371,7 @@ mpqs_combine_large_primes(mpqs_handle_t
|
||||
@@ -2241,7 +2241,7 @@ mpqs_combine_large_primes(mpqs_handle_t
|
||||
*f = gerepileuptoint(av0, inv_q);
|
||||
return c;
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@ $NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
|
|||
i = 1 - i; /* subsequent relations go to other row */
|
||||
av2 = avma; /* preserve inv_q and Y1 */
|
||||
continue;
|
||||
@@ -2381,7 +2381,7 @@ mpqs_combine_large_primes(mpqs_handle_t
|
||||
@@ -2251,7 +2251,7 @@ mpqs_combine_large_primes(mpqs_handle_t
|
||||
memset((void *)ei, 0, ei_size * sizeof(long));
|
||||
mpqs_set_exponents(ei, e[0].E);
|
||||
mpqs_set_exponents(ei, e[1].E);
|
||||
|
|
@ -29,12 +29,12 @@ $NetBSD: patch-src_modules_mpqs.c,v 1.1 2015/01/23 15:07:53 joerg Exp $
|
|||
new_Y = modii(mulii(mulii(Y1, Y2), inv_q), h->N);
|
||||
new_Y1 = subii(h->N, new_Y);
|
||||
if (absi_cmp(new_Y1, new_Y) < 0) new_Y = new_Y1;
|
||||
@@ -2692,7 +2692,7 @@ mpqs_add_relation(GEN Y_prod, GEN N, lon
|
||||
@@ -2362,7 +2362,7 @@ mpqs_add_relation(GEN Y_prod, GEN N, lon
|
||||
s = strchr(rel, ':') - 1;
|
||||
*s = '\0';
|
||||
|
||||
|
||||
- res = remii(mulii(Y_prod, strtoi(rel)), N);
|
||||
+ res = remii(mulii(Y_prod, pari_strtoi(rel)), N);
|
||||
|
||||
s = strtok(s + 3, " \n");
|
||||
s = paristrtok_r(s + 3, " \n", &tok);
|
||||
while (s != NULL)
|
||||
|
|
|
|||
Loading…
Reference in a new issue