[arch-commits] Commit in giac/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue Feb 7 17:55:13 UTC 2017
Date: Tuesday, February 7, 2017 @ 17:55:12
Author: arojas
Revision: 210835
archrelease: copy trunk to community-i686, community-x86_64
Added:
giac/repos/community-i686/PKGBUILD
(from rev 210834, giac/trunk/PKGBUILD)
giac/repos/community-x86_64/PKGBUILD
(from rev 210834, giac/trunk/PKGBUILD)
Deleted:
giac/repos/community-i686/PKGBUILD
giac/repos/community-i686/giac-pari-thread.patch
giac/repos/community-x86_64/PKGBUILD
giac/repos/community-x86_64/giac-pari-thread.patch
-----------------------------------------+
/PKGBUILD | 88 +++++++++++++++++
community-i686/PKGBUILD | 51 ---------
community-i686/giac-pari-thread.patch | 154 ------------------------------
community-x86_64/PKGBUILD | 51 ---------
community-x86_64/giac-pari-thread.patch | 154 ------------------------------
5 files changed, 88 insertions(+), 410 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-07 17:54:36 UTC (rev 210834)
+++ community-i686/PKGBUILD 2017-02-07 17:55:12 UTC (rev 210835)
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 175037 2016-05-12 15:18:07Z arojas $
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgbase=giac
-pkgname=(xcas libgiac)
-_pkgver=1.2.3-21
-pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc="A free computer algebra system"
-arch=(i686 x86_64)
-url="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
-license=(GPL3)
-makedepends=(mpfi gsl pari ntl lapack libpng libjpeg fltk)
-source=("http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${pkgbase}_${_pkgver}.tar.gz" giac-pari-thread.patch)
-md5sums=('a0fd6ab751af6e5f362512207cb83801'
- 'e49775b578ca066295b3bc97429c8101')
-
-prepare() {
- cd $pkgbase-${pkgver%.*}
-# Fix build against thread enabled pari
- patch -p1 -i ../giac-pari-thread.patch
-}
-
-build() {
- cd $pkgbase-${pkgver%.*}
-
- ./configure --prefix=/usr
- make
-}
-
-package_xcas() {
- depends=(libgiac fltk)
- conflicts=(giac)
- provides=(giac)
- replaces=(giac)
-
- cd $pkgbase-${pkgver%.*}
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/{lib,include}
-}
-
-package_libgiac() {
- pkgdesc="Giac shared library"
- depends=(mpfi gsl pari ntl lapack libpng)
-
- cd $pkgbase-${pkgver%.*}
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/{bin,share}
-}
Copied: giac/repos/community-i686/PKGBUILD (from rev 210834, giac/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-07 17:55:12 UTC (rev 210835)
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 175037 2016-05-12 15:18:07Z arojas $
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgbase=giac
+pkgname=(xcas libgiac)
+_pkgver=1.2.3-25
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc="A free computer algebra system"
+arch=(i686 x86_64)
+url="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+license=(GPL3)
+makedepends=(mpfi gsl pari ntl lapack libpng libjpeg fltk)
+source=("http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${pkgbase}_${_pkgver}.tar.gz")
+md5sums=('bedddf3e5fa566f418ca8c6774e53dca')
+
+build() {
+ cd $pkgbase-${pkgver%.*}
+
+ ./configure --prefix=/usr
+ make
+}
+
+package_xcas() {
+ depends=(libgiac fltk)
+ conflicts=(giac)
+ provides=(giac)
+ replaces=(giac)
+
+ cd $pkgbase-${pkgver%.*}
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/{lib,include}
+}
+
+package_libgiac() {
+ pkgdesc="Giac shared library"
+ depends=(mpfi gsl pari ntl lapack libpng)
+
+ cd $pkgbase-${pkgver%.*}
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/{bin,share}
+}
Deleted: community-i686/giac-pari-thread.patch
===================================================================
--- community-i686/giac-pari-thread.patch 2017-02-07 17:54:36 UTC (rev 210834)
+++ community-i686/giac-pari-thread.patch 2017-02-07 17:55:12 UTC (rev 210835)
@@ -1,154 +0,0 @@
-diff --git a/src/pari.cc b/src/pari.cc
-index 441141c..b59bf0b 100644
---- a/src/pari.cc
-+++ b/src/pari.cc
-@@ -53,7 +53,11 @@ static long int abs(long int & l){
- extern "C" {
- #include <pari/pari.h>
- #include <pari/paripriv.h>
-+#ifdef ENABLE_TLS
-+ extern THREAD void *PARI_stack_limit;
-+#else
- extern void *PARI_stack_limit;
-+#endif
- extern entree functions_basic[];
- }
- #if PARI_VERSION_CODE<PARI_VERSION(2,4,0) // 132096
-@@ -106,15 +110,13 @@ namespace giac {
- gp_read_str("[x,y,z,t]");
- }
-
-- struct giac_pari_init {
-- giac_pari_init(long maxprime) {
-- if(!avma){
-- do_giac_pari_init(maxprime);
-- }
-+ static long pari_maxprime=100000;
-+ long get_pari_avma() {
-+ if(!avma){
-+ do_giac_pari_init(pari_maxprime);
- }
-+ return avma;
- };
-- static long pari_maxprime=100000;
-- static giac_pari_init bidon(pari_maxprime);
-
- static gen pow2sizeof_long(pow(256,sizeof(long)));
- // Conversion of a GEN integer to a gen, using Horner method
-@@ -593,7 +595,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- tmp=GEN2gen(gisprime(gen2GEN(e,vecteur(0),0),certif),vecteur(0));
- avma=av;
- #ifdef HAVE_LIBPTHREAD
-@@ -609,7 +611,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=factorint(g,0);
- s=GEN2string(gf);
-@@ -627,7 +629,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=ggamma(g,precision(g));
- res=GEN2gen(gf,vecteur(0));
-@@ -645,7 +647,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=gzeta(g,precision(g));
- res=GEN2gen(gf,vecteur(0));
-@@ -663,7 +665,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=gpsi(g,precision(g));
- res=GEN2gen(gf,vecteur(0));
-@@ -681,7 +683,7 @@ namespace giac {
- abort_if_locked();
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- tmp=GEN2gen(ffinit(gen2GEN(p,vecteur(0),0),n,0),vecteur(0));
- avma=av;
- #ifdef HAVE_LIBPTHREAD
-@@ -698,7 +700,7 @@ namespace giac {
- // GEN combine_factors(GEN a, GEN famod, GEN p, long klim, long hint);
- bool pari_lift_combine(const vecteur & a,const vector<vecteur> & factmod,gen & modulo,vector<vecteur> & res){
- #ifdef PARI23
-- long av=avma;
-+ long av=get_pari_avma();
- GEN pari_a=gen2GEN(r2e(a,x__IDNT_e,context0),vecteur(0),0);
- string s("[");
- vector<vecteur>::const_iterator it=factmod.begin(),itend=factmod.end();
-@@ -731,7 +733,7 @@ namespace giac {
- }
-
- static gen pari_exec(const string & s,GIAC_CONTEXT){
-- long av=avma;
-+ long av=get_pari_avma();
- void * save_pari_stack_limit = PARI_stack_limit;
- PARI_stack_limit=0; // required since the stack changed
- #ifdef PARI23
-@@ -804,7 +806,7 @@ namespace giac {
- lidnt(v,vars,false);
- vars.erase(vars.begin());
- bool parse_all=false;
-- long av=avma;
-+ long av=get_pari_avma();
- #ifdef PARI23
- if (setjmp(GP_DATA->env)){
- avma = av;
-@@ -951,7 +953,7 @@ namespace giac {
- } // end if (i!=pari_function_table.end())
- } // end if vstr!=""
- if (vstr=="" && vs==2){
-- long av=avma;
-+ long av=get_pari_avma();
- gen res= GEN2gen(gen2GEN(v[1],vars,contextptr),vars);
- avma=av;
- return res;
-@@ -1063,7 +1065,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN G=gen2GEN(change_subtype(p,_POLY1__VECT),vecteur(0),contextptr);
- if (debug_infolevel)
- CERR << "pari_polroots " << GEN2gen(G,vecteur(1,vx_var)) << endl;
-@@ -1087,7 +1089,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- void * save_pari_stack_limit = PARI_stack_limit;
- PARI_stack_limit=0;
- GEN P=gen2GEN(p,lv,contextptr);
-@@ -1111,7 +1113,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- void * save_pari_stack_limit = PARI_stack_limit;
- PARI_stack_limit=0;
- GEN P=gen2GEN(p,lv,contextptr);
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-07 17:54:36 UTC (rev 210834)
+++ community-x86_64/PKGBUILD 2017-02-07 17:55:12 UTC (rev 210835)
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 175037 2016-05-12 15:18:07Z arojas $
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgbase=giac
-pkgname=(xcas libgiac)
-_pkgver=1.2.3-21
-pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc="A free computer algebra system"
-arch=(i686 x86_64)
-url="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
-license=(GPL3)
-makedepends=(mpfi gsl pari ntl lapack libpng libjpeg fltk)
-source=("http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${pkgbase}_${_pkgver}.tar.gz" giac-pari-thread.patch)
-md5sums=('a0fd6ab751af6e5f362512207cb83801'
- 'e49775b578ca066295b3bc97429c8101')
-
-prepare() {
- cd $pkgbase-${pkgver%.*}
-# Fix build against thread enabled pari
- patch -p1 -i ../giac-pari-thread.patch
-}
-
-build() {
- cd $pkgbase-${pkgver%.*}
-
- ./configure --prefix=/usr
- make
-}
-
-package_xcas() {
- depends=(libgiac fltk)
- conflicts=(giac)
- provides=(giac)
- replaces=(giac)
-
- cd $pkgbase-${pkgver%.*}
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/{lib,include}
-}
-
-package_libgiac() {
- pkgdesc="Giac shared library"
- depends=(mpfi gsl pari ntl lapack libpng)
-
- cd $pkgbase-${pkgver%.*}
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/{bin,share}
-}
Copied: giac/repos/community-x86_64/PKGBUILD (from rev 210834, giac/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-07 17:55:12 UTC (rev 210835)
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 175037 2016-05-12 15:18:07Z arojas $
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgbase=giac
+pkgname=(xcas libgiac)
+_pkgver=1.2.3-25
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc="A free computer algebra system"
+arch=(i686 x86_64)
+url="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+license=(GPL3)
+makedepends=(mpfi gsl pari ntl lapack libpng libjpeg fltk)
+source=("http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${pkgbase}_${_pkgver}.tar.gz")
+md5sums=('bedddf3e5fa566f418ca8c6774e53dca')
+
+build() {
+ cd $pkgbase-${pkgver%.*}
+
+ ./configure --prefix=/usr
+ make
+}
+
+package_xcas() {
+ depends=(libgiac fltk)
+ conflicts=(giac)
+ provides=(giac)
+ replaces=(giac)
+
+ cd $pkgbase-${pkgver%.*}
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/{lib,include}
+}
+
+package_libgiac() {
+ pkgdesc="Giac shared library"
+ depends=(mpfi gsl pari ntl lapack libpng)
+
+ cd $pkgbase-${pkgver%.*}
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/{bin,share}
+}
Deleted: community-x86_64/giac-pari-thread.patch
===================================================================
--- community-x86_64/giac-pari-thread.patch 2017-02-07 17:54:36 UTC (rev 210834)
+++ community-x86_64/giac-pari-thread.patch 2017-02-07 17:55:12 UTC (rev 210835)
@@ -1,154 +0,0 @@
-diff --git a/src/pari.cc b/src/pari.cc
-index 441141c..b59bf0b 100644
---- a/src/pari.cc
-+++ b/src/pari.cc
-@@ -53,7 +53,11 @@ static long int abs(long int & l){
- extern "C" {
- #include <pari/pari.h>
- #include <pari/paripriv.h>
-+#ifdef ENABLE_TLS
-+ extern THREAD void *PARI_stack_limit;
-+#else
- extern void *PARI_stack_limit;
-+#endif
- extern entree functions_basic[];
- }
- #if PARI_VERSION_CODE<PARI_VERSION(2,4,0) // 132096
-@@ -106,15 +110,13 @@ namespace giac {
- gp_read_str("[x,y,z,t]");
- }
-
-- struct giac_pari_init {
-- giac_pari_init(long maxprime) {
-- if(!avma){
-- do_giac_pari_init(maxprime);
-- }
-+ static long pari_maxprime=100000;
-+ long get_pari_avma() {
-+ if(!avma){
-+ do_giac_pari_init(pari_maxprime);
- }
-+ return avma;
- };
-- static long pari_maxprime=100000;
-- static giac_pari_init bidon(pari_maxprime);
-
- static gen pow2sizeof_long(pow(256,sizeof(long)));
- // Conversion of a GEN integer to a gen, using Horner method
-@@ -593,7 +595,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- tmp=GEN2gen(gisprime(gen2GEN(e,vecteur(0),0),certif),vecteur(0));
- avma=av;
- #ifdef HAVE_LIBPTHREAD
-@@ -609,7 +611,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=factorint(g,0);
- s=GEN2string(gf);
-@@ -627,7 +629,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=ggamma(g,precision(g));
- res=GEN2gen(gf,vecteur(0));
-@@ -645,7 +647,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=gzeta(g,precision(g));
- res=GEN2gen(gf,vecteur(0));
-@@ -663,7 +665,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN g=gen2GEN(e,vecteur(0),0);
- GEN gf=gpsi(g,precision(g));
- res=GEN2gen(gf,vecteur(0));
-@@ -681,7 +683,7 @@ namespace giac {
- abort_if_locked();
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- tmp=GEN2gen(ffinit(gen2GEN(p,vecteur(0),0),n,0),vecteur(0));
- avma=av;
- #ifdef HAVE_LIBPTHREAD
-@@ -698,7 +700,7 @@ namespace giac {
- // GEN combine_factors(GEN a, GEN famod, GEN p, long klim, long hint);
- bool pari_lift_combine(const vecteur & a,const vector<vecteur> & factmod,gen & modulo,vector<vecteur> & res){
- #ifdef PARI23
-- long av=avma;
-+ long av=get_pari_avma();
- GEN pari_a=gen2GEN(r2e(a,x__IDNT_e,context0),vecteur(0),0);
- string s("[");
- vector<vecteur>::const_iterator it=factmod.begin(),itend=factmod.end();
-@@ -731,7 +733,7 @@ namespace giac {
- }
-
- static gen pari_exec(const string & s,GIAC_CONTEXT){
-- long av=avma;
-+ long av=get_pari_avma();
- void * save_pari_stack_limit = PARI_stack_limit;
- PARI_stack_limit=0; // required since the stack changed
- #ifdef PARI23
-@@ -804,7 +806,7 @@ namespace giac {
- lidnt(v,vars,false);
- vars.erase(vars.begin());
- bool parse_all=false;
-- long av=avma;
-+ long av=get_pari_avma();
- #ifdef PARI23
- if (setjmp(GP_DATA->env)){
- avma = av;
-@@ -951,7 +953,7 @@ namespace giac {
- } // end if (i!=pari_function_table.end())
- } // end if vstr!=""
- if (vstr=="" && vs==2){
-- long av=avma;
-+ long av=get_pari_avma();
- gen res= GEN2gen(gen2GEN(v[1],vars,contextptr),vars);
- avma=av;
- return res;
-@@ -1063,7 +1065,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- GEN G=gen2GEN(change_subtype(p,_POLY1__VECT),vecteur(0),contextptr);
- if (debug_infolevel)
- CERR << "pari_polroots " << GEN2gen(G,vecteur(1,vx_var)) << endl;
-@@ -1087,7 +1089,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- void * save_pari_stack_limit = PARI_stack_limit;
- PARI_stack_limit=0;
- GEN P=gen2GEN(p,lv,contextptr);
-@@ -1111,7 +1113,7 @@ namespace giac {
- #ifdef HAVE_LIBPTHREAD
- pthread_cleanup_push(pari_cleanup, (void *) pari_mutex_ptr);
- #endif
-- long av=avma;
-+ long av=get_pari_avma();
- void * save_pari_stack_limit = PARI_stack_limit;
- PARI_stack_limit=0;
- GEN P=gen2GEN(p,lv,contextptr);
More information about the arch-commits
mailing list