Github messages for voidlinux
 help / color / mirror / Atom feed
From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pari: add config options
Date: Sat, 27 Mar 2021 15:53:15 +0100	[thread overview]
Message-ID: <20210327145315.igasT6-5Kni23z19VZXMuXUcvt0mqGcU_MTeFE4-EZ4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29635@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 752 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages pari-conf2
https://github.com/void-linux/void-packages/pull/29635

pari: add config options
This is such that pari is usable when building sagemath, which requires pthread.

Note: pthread also sets --enable-tls (build the thread-safe version of the library). This tends to slow down the shared library libpari.so by about 25%, so it is suggested to use the static library libpari.a instead. How do I do that?
Arch Linux has `export CFLAGS+=' -flto'`, Alpine has `export CFLAGS="$CFLAGS -flto" # reduce speed losses under pthread`.

A patch file from https://github.com/void-linux/void-packages/pull/29635.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pari-conf2-29635.patch --]
[-- Type: text/x-diff, Size: 4189 bytes --]

From 34f0b12db44e4962157e1d36f5ec689500fb7887 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Sat, 20 Mar 2021 18:18:33 +0100
Subject: [PATCH 1/3] pari: add pthread support in config

---
 srcpkgs/pari/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 a2b16b4a8206add1cbb616786375cb166bc49852 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Fri, 26 Mar 2021 09:57:27 +0100
Subject: [PATCH 2/3] pari: add libpari-gmp-tls.so.7

---
 common/shlibs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 6815daac2265..76d5c98731cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,7 +3964,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

From 2922db989cbbac357394ccb953b0ff9e949799f6 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Fri, 26 Mar 2021 09:58:05 +0100
Subject: [PATCH 3/3] giac: update, 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 <orphan@voidlinux.org>"
 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"

  parent reply	other threads:[~2021-03-27 14:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-20 17:20 [PR PATCH] " dkwo
2021-03-22  9:31 ` [PR PATCH] [Updated] " dkwo
2021-03-25  3:11 ` [wip] " ericonr
2021-03-25 20:21 ` [PR PATCH] [Updated] " dkwo
2021-03-25 20:23 ` dkwo
2021-03-26  9:51 ` dkwo
2021-03-26 16:30 ` ericonr
2021-03-26 17:09 ` dkwo
2021-03-26 17:42 ` ericonr
2021-03-27 14:53 ` dkwo [this message]
2021-03-27 14:58 ` dkwo
2021-03-27 19:39 ` tornaria
2021-03-27 22:28 ` tornaria
2021-03-27 22:38 ` tornaria
2021-03-28  6:12 ` ericonr
2021-03-28  6:13 ` ericonr
2021-03-28 10:10 ` [PR PATCH] [Updated] " dkwo
2021-03-28 10:11 ` dkwo
2021-03-28 14:23 ` tornaria
2021-03-28 19:15 ` [wip] " dkwo
2021-04-07 12:59 ` dkwo
2021-05-06 18:17 ` [PR PATCH] [Closed]: " dkwo
2021-08-17 19:06 ` tornaria
2021-08-17 19:42 ` ericonr
2021-08-17 21:41 ` tornaria
2021-08-18  9:15 ` dkwo
2021-08-18  9:15 ` [PR PATCH] [Closed]: " dkwo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210327145315.igasT6-5Kni23z19VZXMuXUcvt0mqGcU_MTeFE4-EZ4@z \
    --to=dkwo@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).