[arch-commits] Commit in pari-git/repos (6 files)
Gaetan Bisson
bisson at archlinux.org
Tue Apr 7 21:21:46 UTC 2015
Date: Tuesday, April 7, 2015 @ 23:21:46
Author: bisson
Revision: 130905
archrelease: copy trunk to community-i686, community-x86_64
Added:
pari-git/repos/community-i686/PKGBUILD
(from rev 130904, pari-git/trunk/PKGBUILD)
pari-git/repos/community-i686/public_memory_functions.patch
(from rev 130904, pari-git/trunk/public_memory_functions.patch)
pari-git/repos/community-x86_64/PKGBUILD
(from rev 130904, pari-git/trunk/PKGBUILD)
pari-git/repos/community-x86_64/public_memory_functions.patch
(from rev 130904, pari-git/trunk/public_memory_functions.patch)
Deleted:
pari-git/repos/community-i686/PKGBUILD
pari-git/repos/community-x86_64/PKGBUILD
------------------------------------------------+
/PKGBUILD | 106 +++++++++++++++++++++++
community-i686/PKGBUILD | 46 ---------
community-i686/public_memory_functions.patch | 61 +++++++++++++
community-x86_64/PKGBUILD | 46 ---------
community-x86_64/public_memory_functions.patch | 61 +++++++++++++
5 files changed, 228 insertions(+), 92 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-04-07 21:21:18 UTC (rev 130904)
+++ community-i686/PKGBUILD 2015-04-07 21:21:46 UTC (rev 130905)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=pari-git
-_pkgname=pari
-pkgver=20150407.f0d91b9
-pkgrel=1
-pkgdesc='Computer algebra system designed for fast computations in number theory'
-url='http://pari.math.u-bordeaux.fr/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gmp' 'readline' 'libx11')
-makedepends=('perl' 'texlive-core' 'git')
-optdepends=('perl: gphelp, tex2mail')
-source=('git+http://pari.math.u-bordeaux.fr/git/pari.git#commit=f0d91b910702e6fb4f9a5f0e82846e92e813e6cd')
-sha1sums=('SKIP')
-
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
-
-pkgver() {
- cd "${srcdir}/${_pkgname}"
- git log -1 --format='%cd.%h' --date=short | tr -d -
-}
-
-build() {
- cd "${srcdir}/${_pkgname}"
- ./Configure \
- --prefix=/usr \
- --with-readline \
- --mt=pthread \
- --with-gmp \
-
- make all
-}
-
-check() {
- cd "${srcdir}/${_pkgname}"
- make bench
-}
-
-package() {
- cd "${srcdir}/${_pkgname}"
- make DESTDIR="${pkgdir}" install
- ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1
-}
Copied: pari-git/repos/community-i686/PKGBUILD (from rev 130904, pari-git/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-04-07 21:21:46 UTC (rev 130905)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=pari-git
+_pkgname=pari
+pkgver=20150407.f0d91b9
+pkgrel=2
+pkgdesc='Computer algebra system designed for fast computations in number theory'
+url='http://pari.math.u-bordeaux.fr/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('gmp' 'readline' 'libx11')
+makedepends=('perl' 'texlive-core' 'git')
+optdepends=('perl: gphelp, tex2mail')
+source=('git+http://pari.math.u-bordeaux.fr/git/pari.git#commit=f0d91b910702e6fb4f9a5f0e82846e92e813e6cd'
+ 'public_memory_functions.patch')
+sha1sums=('SKIP'
+ 'a88bca1bc18e6eea90c34a9ea88f16c7f1ec28c8')
+
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+
+pkgver() {
+ cd "${srcdir}/${_pkgname}"
+ git log -1 --format='%cd.%h' --date=short | tr -d -
+}
+
+prepare() {
+ cd "${srcdir}/${_pkgname}"
+ patch -p1 -i ../public_memory_functions.patch
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}"
+ ./Configure \
+ --prefix=/usr \
+ --with-readline \
+ --mt=pthread \
+ --with-gmp \
+
+ make all
+}
+
+check() {
+ cd "${srcdir}/${_pkgname}"
+ make bench
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}"
+ make DESTDIR="${pkgdir}" install
+ ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1
+}
Copied: pari-git/repos/community-i686/public_memory_functions.patch (from rev 130904, pari-git/trunk/public_memory_functions.patch)
===================================================================
--- community-i686/public_memory_functions.patch (rev 0)
+++ community-i686/public_memory_functions.patch 2015-04-07 21:21:46 UTC (rev 130905)
@@ -0,0 +1,61 @@
+diff --git a/src/headers/paridecl.h b/src/headers/paridecl.h
+index 7067183..4ede6ed 100644
+--- a/src/headers/paridecl.h
++++ b/src/headers/paridecl.h
+@@ -2819,6 +2819,9 @@ GEN pari_thread_start(struct pari_thread *t);
+ void pari_thread_valloc(struct pari_thread *t, size_t s, size_t v, GEN arg);
+ GEN pari_version(void);
+ void pari_warn(int numerr, ...);
++void * pari_mainstack_malloc(size_t size);
++void pari_mainstack_mfree(void *s, size_t size);
++void pari_mainstack_free(struct pari_mainstack *st);
+ void paristack_alloc(size_t rsize, size_t vsize);
+ void paristack_newrsize(ulong newsize);
+ void paristack_resize(ulong newsize);
+diff --git a/src/language/init.c b/src/language/init.c
+index 7b5922d..2a578d7 100644
+--- a/src/language/init.c
++++ b/src/language/init.c
+@@ -612,7 +612,7 @@ pari_add_oldmodule(entree *ep)
+ #ifndef MAP_NORESERVE
+ #define MAP_NORESERVE 0
+ #endif
+-static void *
++void *
+ pari_mainstack_malloc(size_t size)
+ {
+ void *b = mmap(NULL, size, PROT_READ|PROT_WRITE,
+@@ -620,7 +620,7 @@ pari_mainstack_malloc(size_t size)
+ return (b == MAP_FAILED) ? NULL: b;
+ }
+
+-static void
++void
+ pari_mainstack_mfree(void *s, size_t size)
+ {
+ munmap(s, size);
+@@ -634,13 +634,13 @@ pari_mainstack_mreset(void *s, size_t size)
+
+ #else
+ #define PARI_STACK_ALIGN (0x40UL)
+-static void *
++void *
+ pari_mainstack_malloc(size_t s)
+ {
+ return malloc(s); /* NOT pari_malloc, e_MEM would be deadly */
+ }
+
+-static void
++void
+ pari_mainstack_mfree(void *s, size_t size) { (void) size; free(s); }
+
+ static void
+@@ -681,7 +681,7 @@ pari_mainstack_alloc(struct pari_mainstack *st, size_t rsize, size_t vsize)
+ st->memused = 0;
+ }
+
+-static void
++void
+ pari_mainstack_free(struct pari_mainstack *st)
+ {
+ pari_mainstack_mfree((void*)st->vbot, st->vsize ? st->vsize : fix_size(st->rsize));
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-04-07 21:21:18 UTC (rev 130904)
+++ community-x86_64/PKGBUILD 2015-04-07 21:21:46 UTC (rev 130905)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=pari-git
-_pkgname=pari
-pkgver=20150407.f0d91b9
-pkgrel=1
-pkgdesc='Computer algebra system designed for fast computations in number theory'
-url='http://pari.math.u-bordeaux.fr/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gmp' 'readline' 'libx11')
-makedepends=('perl' 'texlive-core' 'git')
-optdepends=('perl: gphelp, tex2mail')
-source=('git+http://pari.math.u-bordeaux.fr/git/pari.git#commit=f0d91b910702e6fb4f9a5f0e82846e92e813e6cd')
-sha1sums=('SKIP')
-
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
-
-pkgver() {
- cd "${srcdir}/${_pkgname}"
- git log -1 --format='%cd.%h' --date=short | tr -d -
-}
-
-build() {
- cd "${srcdir}/${_pkgname}"
- ./Configure \
- --prefix=/usr \
- --with-readline \
- --mt=pthread \
- --with-gmp \
-
- make all
-}
-
-check() {
- cd "${srcdir}/${_pkgname}"
- make bench
-}
-
-package() {
- cd "${srcdir}/${_pkgname}"
- make DESTDIR="${pkgdir}" install
- ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1
-}
Copied: pari-git/repos/community-x86_64/PKGBUILD (from rev 130904, pari-git/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-04-07 21:21:46 UTC (rev 130905)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=pari-git
+_pkgname=pari
+pkgver=20150407.f0d91b9
+pkgrel=2
+pkgdesc='Computer algebra system designed for fast computations in number theory'
+url='http://pari.math.u-bordeaux.fr/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('gmp' 'readline' 'libx11')
+makedepends=('perl' 'texlive-core' 'git')
+optdepends=('perl: gphelp, tex2mail')
+source=('git+http://pari.math.u-bordeaux.fr/git/pari.git#commit=f0d91b910702e6fb4f9a5f0e82846e92e813e6cd'
+ 'public_memory_functions.patch')
+sha1sums=('SKIP'
+ 'a88bca1bc18e6eea90c34a9ea88f16c7f1ec28c8')
+
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+
+pkgver() {
+ cd "${srcdir}/${_pkgname}"
+ git log -1 --format='%cd.%h' --date=short | tr -d -
+}
+
+prepare() {
+ cd "${srcdir}/${_pkgname}"
+ patch -p1 -i ../public_memory_functions.patch
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}"
+ ./Configure \
+ --prefix=/usr \
+ --with-readline \
+ --mt=pthread \
+ --with-gmp \
+
+ make all
+}
+
+check() {
+ cd "${srcdir}/${_pkgname}"
+ make bench
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}"
+ make DESTDIR="${pkgdir}" install
+ ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1
+}
Copied: pari-git/repos/community-x86_64/public_memory_functions.patch (from rev 130904, pari-git/trunk/public_memory_functions.patch)
===================================================================
--- community-x86_64/public_memory_functions.patch (rev 0)
+++ community-x86_64/public_memory_functions.patch 2015-04-07 21:21:46 UTC (rev 130905)
@@ -0,0 +1,61 @@
+diff --git a/src/headers/paridecl.h b/src/headers/paridecl.h
+index 7067183..4ede6ed 100644
+--- a/src/headers/paridecl.h
++++ b/src/headers/paridecl.h
+@@ -2819,6 +2819,9 @@ GEN pari_thread_start(struct pari_thread *t);
+ void pari_thread_valloc(struct pari_thread *t, size_t s, size_t v, GEN arg);
+ GEN pari_version(void);
+ void pari_warn(int numerr, ...);
++void * pari_mainstack_malloc(size_t size);
++void pari_mainstack_mfree(void *s, size_t size);
++void pari_mainstack_free(struct pari_mainstack *st);
+ void paristack_alloc(size_t rsize, size_t vsize);
+ void paristack_newrsize(ulong newsize);
+ void paristack_resize(ulong newsize);
+diff --git a/src/language/init.c b/src/language/init.c
+index 7b5922d..2a578d7 100644
+--- a/src/language/init.c
++++ b/src/language/init.c
+@@ -612,7 +612,7 @@ pari_add_oldmodule(entree *ep)
+ #ifndef MAP_NORESERVE
+ #define MAP_NORESERVE 0
+ #endif
+-static void *
++void *
+ pari_mainstack_malloc(size_t size)
+ {
+ void *b = mmap(NULL, size, PROT_READ|PROT_WRITE,
+@@ -620,7 +620,7 @@ pari_mainstack_malloc(size_t size)
+ return (b == MAP_FAILED) ? NULL: b;
+ }
+
+-static void
++void
+ pari_mainstack_mfree(void *s, size_t size)
+ {
+ munmap(s, size);
+@@ -634,13 +634,13 @@ pari_mainstack_mreset(void *s, size_t size)
+
+ #else
+ #define PARI_STACK_ALIGN (0x40UL)
+-static void *
++void *
+ pari_mainstack_malloc(size_t s)
+ {
+ return malloc(s); /* NOT pari_malloc, e_MEM would be deadly */
+ }
+
+-static void
++void
+ pari_mainstack_mfree(void *s, size_t size) { (void) size; free(s); }
+
+ static void
+@@ -681,7 +681,7 @@ pari_mainstack_alloc(struct pari_mainstack *st, size_t rsize, size_t vsize)
+ st->memused = 0;
+ }
+
+-static void
++void
+ pari_mainstack_free(struct pari_mainstack *st)
+ {
+ pari_mainstack_mfree((void*)st->vbot, st->vsize ? st->vsize : fix_size(st->rsize));
More information about the arch-commits
mailing list