From 808feb7f41b36973bef29e47b8d115eb5529ae55 Mon Sep 17 00:00:00 2001 From: David Stes <55844484+cstes@users.noreply.github.com> Date: Mon, 22 Nov 2021 21:46:45 +0100 Subject: [PATCH] pari: add patch for genfunclist --- components/scientific/pari/Makefile | 8 ++++++-- components/scientific/pari/patches/01-genfunclist.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/components/scientific/pari/Makefile b/components/scientific/pari/Makefile index 5a89fa7..eaf81e8 100644 --- a/components/scientific/pari/Makefile +++ b/components/scientific/pari/Makefile @@ -24,6 +24,7 @@ COMPONENT_NAME= pari COMPONENT_VERSION= 2.13.3 +COMPONENT_REVISION= 1 COMPONENT_SUMMARY= The PARI Computer Algebra System COMPONENT_PROJECT_URL= https://pari.math.u-bordeaux.fr COMPONENT_FMRI= library/math/pari @@ -44,6 +45,7 @@ PATH=$(PATH.gnu) # Configure complains when built outside of source tree +# The PARI script config/genfunclist uses find -type f and fails on symlinks COMPONENT_PRE_CONFIGURE_ACTION= ($(CLONEY) $(SOURCE_DIR) $(@D)) # PARI/gp Configure is not autoconf @@ -55,13 +57,15 @@ # PARI/gp installs its 64bit library in /usr/lib CONFIGURE_OPTIONS+= --libdir=$(USRLIBDIR64) -# PARI/gp says GMP on OpenIndiana is too old +# PARI/gp can be compiled with GMP but does not find gmp.h in /usr/include/gmp +# CONFIGURE_OPTIONS= --with-gmp-include=/usr/include/gmp +# our choice is to use the native kernel i.e., compile without GMP CONFIGURE_OPTIONS+= --without-gmp CONFIGURE_ENV+= CFLAGS="$(CFLAGS)" # all does not work because documentation requires Tex typesetting -COMPONENT_BUILD_TARGET = gp +COMPONENT_BUILD_TARGETS = gp # Auto-generated dependencies REQUIRED_PACKAGES += library/readline diff --git a/components/scientific/pari/patches/01-genfunclist.patch b/components/scientific/pari/patches/01-genfunclist.patch new file mode 100644 index 0000000..15d91ba --- /dev/null +++ b/components/scientific/pari/patches/01-genfunclist.patch @@ -0,0 +1,11 @@ +--- pari-2.13.3/config/genfunclist Wed Mar 25 12:58:26 2020 ++++ p0/pari-2.13.3/config/genfunclist Mon Nov 22 15:52:15 2021 +@@ -2,7 +2,7 @@ + FL="$1" + DIR="$2" + TMPFL=$FL.tmp$$ +-(cd $DIR && find ../functions -name CVS -prune -o -name '.*' -prune -o -name '*~' -prune -o -type f -print | env LANG= LC_COLLATE= LC_ALL= sort | xargs cksum ) > $TMPFL ++(cd $DIR && find ../functions -name CVS -prune -o -name '.*' -prune -o -name '*~' -prune -o -type l -print | env LANG= LC_COLLATE= LC_ALL= sort | xargs cksum ) > $TMPFL + if cmp $FL $TMPFL >/dev/null 2>&1; then + rm -f $TMPFL + else -- Gitblit v1.9.3