From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] pari: update to 2.15.2.
Date: Wed, 01 Feb 2023 17:13:16 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42016@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages pari
https://github.com/void-linux/void-packages/pull/42016
pari: update to 2.15.2.
Also:
- use -flto=auto for multithreaded link
- change build so we don't need to patch makefile
- ship pdf documentation in addtion to dvi
- use SOURCE_DATE_EPOCH for dvi files
- backport fix for pari bug 2441
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42016.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pari-42016.patch --]
[-- Type: text/x-diff, Size: 7187 bytes --]
From b62fe9ac88f1440bdb1d630a73ae9c770a4ba789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 29 Dec 2022 17:31:30 -0300
Subject: [PATCH] pari: update to 2.15.2.
Also:
- use -flto=auto for multithreaded link
- change build so we don't need to patch makefile
- ship pdf documentation in addtion to dvi
- use SOURCE_DATE_EPOCH for dvi files
- backport fix for pari bug 2441
---
srcpkgs/pari/patches/bug-2441.patch | 17 ++++++++++
srcpkgs/pari/patches/float32.patch | 48 -----------------------------
srcpkgs/pari/patches/makefile.patch | 36 ----------------------
srcpkgs/pari/template | 20 ++++++------
4 files changed, 27 insertions(+), 94 deletions(-)
create mode 100644 srcpkgs/pari/patches/bug-2441.patch
delete mode 100644 srcpkgs/pari/patches/float32.patch
delete mode 100644 srcpkgs/pari/patches/makefile.patch
diff --git a/srcpkgs/pari/patches/bug-2441.patch b/srcpkgs/pari/patches/bug-2441.patch
new file mode 100644
index 000000000000..aaaeef394a83
--- /dev/null
+++ b/srcpkgs/pari/patches/bug-2441.patch
@@ -0,0 +1,17 @@
+Source: https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?att=1;bug=2441;filename=patch;msg=25
+See: https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441
+
+diff --git a/src/basemath/ellsea.c b/src/basemath/ellsea.c
+index a6871fa6a7..05f148eadd 100644
+--- a/src/basemath/ellsea.c
++++ b/src/basemath/ellsea.c
+@@ -852,7 +852,8 @@ find_isogenous_from_Atkin(GEN a4, GEN a6, ulong ell, struct meqn *MEQN, GEN g, G
+ GEN a4t, a6t, h;
+ a4a6t(&a4t, &a6t, ell, E4t, E6t, T, p);
+ h = find_kernel(a4, a6, ell, a4t, a6t, pp1, T, p, pp, e);
+- if (h) return gerepilecopy(ltop, mkvec3(a4t, a6t, h));
++ if (h && signe(Fq_elldivpolmod(a4, a6, ell, h, T, pp))==0)
++ return gerepilecopy(ltop, mkvec3(a4t, a6t, h));
+ }
+ }
+ pari_err_BUG("find_isogenous_from_Atkin, kernel not found");
diff --git a/srcpkgs/pari/patches/float32.patch b/srcpkgs/pari/patches/float32.patch
deleted file mode 100644
index 311dd6bf5a07..000000000000
--- a/srcpkgs/pari/patches/float32.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Author: Gonzalo Tornaría <tornaria@cmat.edu.uy>
-Date: Fri Oct 14 17:00:46 2022 -0300
-
- Revert "x86 (32bit): force -mpc64 on compilers that supports it."
-
- This reverts commit ca61b6391cf95ac8af15669236e2ec5839d2ad91.
-
-
-This causes problems with floating point precision on i686:
-```
-$ cat exp40.c
-#include <math.h>
-#include <stdio.h>
-int main() {
- volatile int a=40; /* do not optimize away the call to exp(a) */
- printf("%f\n", exp(a));
-}
-$ cc -Wall exp40.c -lm && ./a.out
-235385266837020000.000000
-$ cc -Wall exp40.c -lm -mpc64 && ./a.out
-235385266837020448.000000
-```
-
-Note that when pari is built using -mpc64, just *linking* with -lpari
-causes the problem!!!
-```
-$ cc -Wall exp40.c -lm -lpari && ./a.out
-235385266837020448.000000
-```
-
-diff --git a/config/get_cc b/config/get_cc
-index 3cfaa88bb7..2d61d3871f 100644
---- a/config/get_cc
-+++ b/config/get_cc
-@@ -110,13 +110,6 @@ if test -n "$__gnuc__"; then
- # Specific optimisations for some architectures
- case "$arch" in
- sparcv8*) cflags=-mv8;;
-- i?86)
-- cmd="$CC $CFLAGS $extraflag -mpc64 -fno-strict-aliasing -o $exe gnu.c"
-- . log_cmd
-- if test -s $exe; then
-- cflags="-mpc64"
-- fi
-- . cleanup_exe;;
- esac
- # problems on some architectures
- case "$osname" in
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH 2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH 2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- @\$(MAKE) gp
- @-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
-
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- @dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index fac7a86e3cf9..d07a939156cb 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,14 +1,14 @@
# Template file for 'pari'
pkgname=pari
-version=2.15.1
+version=2.15.2
revision=1
build_style=configure
build_helper=qemu
configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread)"
+make_build_target="gp doc docpdf"
make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+make_install_target="install install-bin-sta install-lib-sta install-docpdf"
hostmakedepends="perl texlive"
makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
checkdepends="pari-elldata-small pari-galdata pari-galpol-small
@@ -19,19 +19,19 @@ license="GPL-2.0-or-later"
homepage="https://pari.math.u-bordeaux.fr"
changelog="https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=blob_plain;f=CHANGES;hb=refs/heads/pari-${version%.*}"
distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-${version}.tar.gz"
-checksum=45419db77c6685bee67e42e0ecb78e19ef562be7aafc637c8a41970f2e909e3d
+checksum=b04628111ee22876519a4b1cdafb32febaa34eafa24f9e81f58f8d057fbee0dd
build_options="x11 pthreads"
build_options_default="x11 pthreads"
desc_option_pthreads="Enable support for pthreads"
# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+CFLAGS="-flto=auto -fno-semantic-interposition"
-case $XBPS_TARGET_MACHINE in
- # avoid numerical noise caused by extended-precision of registers
- i686*) CFLAGS+=" -ffloat-store" ;;
-esac
+# force `etex` to use SOURCE_DATE_EPOCH when creating dvi files
+# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897627
+export FORCE_SOURCE_DATE=1
+make_build_args="TEX=etex"
post_patch() {
# sse2 is not available on all i686
next reply other threads:[~2023-02-01 16:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 16:13 tornaria [this message]
2023-02-02 20:35 ` tornaria
2023-02-05 13:58 ` [PR PATCH] [Updated] " tornaria
2023-02-05 13:59 ` tornaria
2023-02-13 16:48 ` [PR PATCH] [Merged]: " leahneukirchen
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42016@inbox.vuxu.org \
--to=tornaria@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).