| 1 |
bicatali 11/07/27 19:03:56 |
| 2 |
|
| 3 |
Added: pari-2.5.0-mp.c.patch pari-2.5.0-doc-make.patch |
| 4 |
pari-2.5.0-macos.patch |
| 5 |
Log: |
| 6 |
Split up data to another pari-data packages, due to upstream not updating its package names. Added a few patches submitted by Francois Bissey: one for parallel make, one for sage compatibility and one for ppc-macos |
| 7 |
|
| 8 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-mathematics/pari/files/pari-2.5.0-mp.c.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: pari-2.5.0-mp.c.patch |
| 17 |
=================================================================== |
| 18 |
Index: src/kernel/gmp/mp.c |
| 19 |
=================================================================== |
| 20 |
--- src/kernel/gmp/mp.c (revision 13151) |
| 21 |
+++ src/kernel/gmp/mp.c (working copy) |
| 22 |
@@ -45,18 +45,8 @@ |
| 23 |
/*We need PARI invmod renamed to invmod_pari*/ |
| 24 |
#define INVMOD_PARI |
| 25 |
|
| 26 |
-static void *gmp_realloc(void *ptr, size_t old_size, size_t new_size) { |
| 27 |
- (void)old_size; return (void *) pari_realloc(ptr,new_size); |
| 28 |
-} |
| 29 |
- |
| 30 |
-static void gmp_free(void *ptr, size_t old_size){ |
| 31 |
- (void)old_size; pari_free(ptr); |
| 32 |
-} |
| 33 |
- |
| 34 |
int pari_kernel_init(void) |
| 35 |
{ |
| 36 |
- /* Use pari_malloc instead of malloc */ |
| 37 |
- mp_set_memory_functions((void *(*)(size_t)) pari_malloc, gmp_realloc, gmp_free); |
| 38 |
return 0; |
| 39 |
} |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 sci-mathematics/pari/files/pari-2.5.0-doc-make.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: pari-2.5.0-doc-make.patch |
| 49 |
=================================================================== |
| 50 |
--- config/DOC_Make.SH.orig 2010-09-07 07:26:42.000000000 +1200 |
| 51 |
+++ config/DOC_Make.SH 2010-09-26 14:56:35.445516459 +1300 |
| 52 |
@@ -11,7 +11,8 @@ |
| 53 |
|
| 54 |
doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi |
| 55 |
docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps |
| 56 |
-docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf |
| 57 |
+#docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf |
| 58 |
+docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf |
| 59 |
|
| 60 |
.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html |
| 61 |
|
| 62 |
@@ -30,27 +31,49 @@ |
| 63 |
usersch3.tex: ../src/desc/doc_make ../src/desc/pari.desc usersFUNCS.tex |
| 64 |
cd ../src/desc && \$(PERL) doc_make > ../../doc/usersch3.tex |
| 65 |
|
| 66 |
+pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS) |
| 67 |
+ -rm -f *.std |
| 68 |
+ pdftex libpari |
| 69 |
+ pdftex develop |
| 70 |
+ pdftex tutorial |
| 71 |
+ pdftex users |
| 72 |
+ |
| 73 |
+pass2: pass1 |
| 74 |
+ pdftex libpari |
| 75 |
+ pdftex develop |
| 76 |
+ pdftex tutorial |
| 77 |
+ pdftex users |
| 78 |
+ |
| 79 |
+indexing: pass2 |
| 80 |
+ \$(MAKE) libpari.std |
| 81 |
+ \$(MAKE) develop.std |
| 82 |
+ \$(MAKE) users.std |
| 83 |
+ pdftex libpari |
| 84 |
+ pdftex develop |
| 85 |
+ pdftex users |
| 86 |
+ -rm -f *.std |
| 87 |
+ |
| 88 |
libpari.pdf: \$(PARI_TEX) \$(MACROS) |
| 89 |
-rm -f libpari.std |
| 90 |
pdftex libpari |
| 91 |
pdftex libpari |
| 92 |
- make libpari.std; pdftex libpari; rm -f libpari.std |
| 93 |
+ \$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std |
| 94 |
libpari.dvi: \$(PARI_TEX) \$(MACROS) |
| 95 |
-rm -f libpari.std |
| 96 |
tex libpari |
| 97 |
tex libpari |
| 98 |
- make libpari.std; tex libpari; rm -f libpari.std |
| 99 |
+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std |
| 100 |
|
| 101 |
develop.pdf: develop.tex \$(MACROS) |
| 102 |
-rm -f develop.std |
| 103 |
pdftex develop |
| 104 |
pdftex develop |
| 105 |
- make develop.std; pdftex develop; rm -f develop.std |
| 106 |
+ \$(MAKE) develop.std; pdftex develop; rm -f develop.std |
| 107 |
develop.dvi: develop.tex \$(MACROS) |
| 108 |
-rm -f develop.std |
| 109 |
tex develop |
| 110 |
tex develop |
| 111 |
- make develop.std; tex develop; rm -f develop.std |
| 112 |
+ \$(MAKE) develop.std; tex develop; rm -f develop.std |
| 113 |
|
| 114 |
tutorial.pdf: tutorial.tex \$(MACROS) |
| 115 |
-rm -f tutorial.std |
| 116 |
@@ -78,13 +101,13 @@ |
| 117 |
-rm -f users.std |
| 118 |
tex users |
| 119 |
tex users |
| 120 |
- make users.std; tex users; rm -f users.std |
| 121 |
+ \$(MAKE) users.std; tex users; rm -f users.std |
| 122 |
|
| 123 |
users.pdf: \$(USERS_TEX) |
| 124 |
-rm -f users.std |
| 125 |
pdftex users |
| 126 |
pdftex users |
| 127 |
- make users.std; pdftex users; rm -f users.std |
| 128 |
+ \$(MAKE) users.std; pdftex users; rm -f users.std |
| 129 |
|
| 130 |
gpman: gp.1 |
| 131 |
nroff -man gp.1 | unix2dos -ascii > gp.man |
| 132 |
|
| 133 |
|
| 134 |
|
| 135 |
1.1 sci-mathematics/pari/files/pari-2.5.0-macos.patch |
| 136 |
|
| 137 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pari/files/pari-2.5.0-macos.patch?rev=1.1&view=markup |
| 138 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pari/files/pari-2.5.0-macos.patch?rev=1.1&content-type=text/plain |
| 139 |
|
| 140 |
Index: pari-2.5.0-macos.patch |
| 141 |
=================================================================== |
| 142 |
--- config/get_dlld.orig 2010-12-21 13:49:25.000000000 +1300 |
| 143 |
+++ config/get_dlld 2010-12-21 14:04:21.000000000 +1300 |
| 144 |
@@ -93,7 +93,7 @@ |
| 145 |
*) extra=;; |
| 146 |
esac |
| 147 |
case "$osname" in |
| 148 |
- darwin) shared=-dynamiclib;; |
| 149 |
+ darwin) shared="-dynamiclib -install_name \$(PURELIBDIR)/\$(LIBPARI_DYN)";; |
| 150 |
*) shared=-shared;; |
| 151 |
esac |
| 152 |
DLLDFLAGS="$shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS" |
| 153 |
--- config/Makefile.SH.orig 2010-12-23 11:51:01.000000000 +1300 |
| 154 |
+++ config/Makefile.SH 2010-12-23 11:52:10.000000000 +1300 |
| 155 |
@@ -231,6 +231,7 @@ |
| 156 |
# DESTDIR is used to install to a false hierachy (to build a Debian package) |
| 157 |
INCLUDEDIR= "\$(DESTDIR)$includedir" |
| 158 |
LIBDIR = "\$(DESTDIR)$libdir" |
| 159 |
+PURELIBDIR= $libdir |
| 160 |
BINDIR = "\$(DESTDIR)$bindir" |
| 161 |
MANDIR = "\$(DESTDIR)$mandir" |
| 162 |
DATADIR = "\$(DESTDIR)$datadir" |
Archives