From 137fbe0f5f5ebafcae3714cad78df61d821e97d7 Mon Sep 17 00:00:00 2001 From: Nicolo Date: Sat, 20 Mar 2021 18:18:33 +0100 Subject: [PATCH 1/2] pari: add pthread support in config, add libpari-gmp-tls.so.7 --- common/shlibs | 3 ++- srcpkgs/pari/template | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7319cc8d20cb..8d79bac4c9ac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3963,7 +3963,8 @@ libopenaptx.so.0 libopenaptx-0.2.0_1 libsimavr.so.1 simavr-1.6_2 libsimavrparts.so.1 simavr-1.6_2 libsword-1.8.1.so libsword-1.8.1_6 -libpari-gmp.so.7 pari-2.13.0_1 +libpari-gmp.so.7 pari-2.13.1_2 +libpari-gmp-tls.so.7 pari-2.13.1_2 libtree-sitter.so.0 tree-sitter-0.19.0_1 libwayland-client++.so.0 libwaylandpp-0.2.8_1 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1 diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template index 8e2a415913ba..262c0c26aac2 100644 --- a/srcpkgs/pari/template +++ b/srcpkgs/pari/template @@ -1,11 +1,11 @@ # Template file for 'pari' pkgname=pari version=2.13.1 -revision=1 +revision=2 build_style=configure build_helper=qemu configure_script=./Configure -configure_args="--prefix=/usr" +configure_args="--prefix=/usr --with-readline --mt=pthread --with-gmp" make_build_target=all make_check_target=test-all hostmakedepends="perl texlive" @@ -19,6 +19,8 @@ checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1 build_options="x11" build_options_default="x11" +# reduce speed losses under pthread +CFLAGS=-flto post_patch() { # sse2 is not available on all i686 From a5ea2198eb7c613d4535c392672dbf413e3c1154 Mon Sep 17 00:00:00 2001 From: Nicolo Date: Fri, 26 Mar 2021 09:58:05 +0100 Subject: [PATCH 2/2] giac: update to 1.7.0.1, edit config and malloc.patch --- srcpkgs/giac/patches/malloc.patch | 6 +++--- srcpkgs/giac/template | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/giac/patches/malloc.patch b/srcpkgs/giac/patches/malloc.patch index 3f2b05b37d04..85c653a04a82 100644 --- a/srcpkgs/giac/patches/malloc.patch +++ b/srcpkgs/giac/patches/malloc.patch @@ -1,11 +1,11 @@ --- src/History.cc.orig 2017-10-02 10:23:46.000000000 +0200 +++ src/History.cc 2017-11-14 15:42:12.119849965 +0100 -@@ -3828,7 +3828,7 @@ +@@ -4352,7 +4352,7 @@ // mode_s += "Time: "; // double t=double(clock()); // mode_s += xcas::print_DOUBLE_(t/CLOCKS_PER_SEC); --#ifdef HAVE_MALLOC_H // -+#if defined HAVE_MALLOC_H && defined __GLIBC__ // +-#if defined(HAVE_MALLOC_H) && !defined(__MINGW_H) ++#if defined(HAVE_MALLOC_H) && !defined(__MINGW_H) && defined(__GLIBC__) struct mallinfo mem=mallinfo(); double memd=mem.arena+mem.hblkhd; mode_s +=xcas::print_DOUBLE_(memd/1048576); diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index ca95534498f2..f8d08ef9f749 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,9 +1,10 @@ # Template file for 'giac' pkgname=giac -version=1.5.0.87 -revision=4 +version=1.7.0.1 +revision=1 wrksrc="giac-${version%.*}" build_style=gnu-configure +configure_args="--disable-micropy --disable-quickjs" makedepends="fltk-devel gmp-devel gsl-devel lapack-devel libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel" depends="desktop-file-utils hicolor-icon-theme" @@ -12,7 +13,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4 +checksum=385d4192f4217c0edd5884a02761a6d29f63fba50d6628c0775951a1be322269 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152"