From ca43ddd0b5dc0d86f0675c08402ce828c1f003b8 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Tue, 21 Apr 2020 16:30:28 -0700 Subject: [PATCH 1/6] build/pkgs/giac/spkg-configure.m4: New --- build/pkgs/giac/spkg-configure.m4 | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 build/pkgs/giac/spkg-configure.m4 diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4 new file mode 100644 index 00000000000..1dc4471b7ed --- /dev/null +++ b/build/pkgs/giac/spkg-configure.m4 @@ -0,0 +1,8 @@ +SAGE_SPKG_CONFIGURE([giac], [ + SAGE_SPKG_DEPCHECK([pari], [ + AC_CHECK_HEADER([giac/giac.h], [ + AC_SEARCH_LIBS([ConvertUTF16toUTF8], [giac], [ + ], [sage_spkg_install_giac=yes]) + ], [sage_spkg_install_giac=yes]) + ]) +]) From 64e80ac042b10732734bf141906c5df6a4433a50 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 10 Aug 2020 16:37:55 -0700 Subject: [PATCH 2/6] build/pkgs/giac/distros: Add debian, fedora, opensuse --- build/pkgs/giac/distros/debian.txt | 1 + build/pkgs/giac/distros/fedora.txt | 1 + build/pkgs/giac/distros/opensuse.txt | 1 + 3 files changed, 3 insertions(+) create mode 100644 build/pkgs/giac/distros/debian.txt create mode 100644 build/pkgs/giac/distros/fedora.txt create mode 100644 build/pkgs/giac/distros/opensuse.txt diff --git a/build/pkgs/giac/distros/debian.txt b/build/pkgs/giac/distros/debian.txt new file mode 100644 index 00000000000..95d5a01a1e6 --- /dev/null +++ b/build/pkgs/giac/distros/debian.txt @@ -0,0 +1 @@ +libgiac-dev diff --git a/build/pkgs/giac/distros/fedora.txt b/build/pkgs/giac/distros/fedora.txt new file mode 100644 index 00000000000..d3451656a62 --- /dev/null +++ b/build/pkgs/giac/distros/fedora.txt @@ -0,0 +1 @@ +giac diff --git a/build/pkgs/giac/distros/opensuse.txt b/build/pkgs/giac/distros/opensuse.txt new file mode 100644 index 00000000000..d3451656a62 --- /dev/null +++ b/build/pkgs/giac/distros/opensuse.txt @@ -0,0 +1 @@ +giac From ab410b9c9f7be39f2a6135f5fb2ea1d15020b9b6 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 11 Aug 2020 21:33:07 -0700 Subject: [PATCH 3/6] build/pkgs/giac/spkg-configure.m4: Test for giac executable --- build/pkgs/giac/spkg-configure.m4 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4 index 1dc4471b7ed..4e68e6ae2b8 100644 --- a/build/pkgs/giac/spkg-configure.m4 +++ b/build/pkgs/giac/spkg-configure.m4 @@ -1,8 +1,23 @@ SAGE_SPKG_CONFIGURE([giac], [ SAGE_SPKG_DEPCHECK([pari], [ + dnl giac does not seem to reveal its patchlevel + m4_pushdef([GIAC_MIN_VERSION], [1.5.0]) + AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION, [ac_cv_path_GIAC], [ + AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [ + giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1) + AS_IF([test -n "$giac_version"], [ + AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [ + ac_cv_path_GIAC="$ac_path_GIAC" + ]) + ]) + ]) + ]) + AS_IF([test -z "$ac_cv_path_GIAC"], + [sage_spkg_install_giac=yes]) AC_CHECK_HEADER([giac/giac.h], [ AC_SEARCH_LIBS([ConvertUTF16toUTF8], [giac], [ ], [sage_spkg_install_giac=yes]) ], [sage_spkg_install_giac=yes]) + m4_popdef([GIAC_MIN_VERSION]) ]) ]) From 83543d014e46042c984396e330538055463d8405 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 11 Aug 2020 21:33:20 -0700 Subject: [PATCH 4/6] build/pkgs/giac/distros: Add missing packages --- build/pkgs/giac/distros/arch.txt | 2 +- build/pkgs/giac/distros/debian.txt | 1 + build/pkgs/giac/distros/fedora.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/pkgs/giac/distros/arch.txt b/build/pkgs/giac/distros/arch.txt index c41a7f1230a..7bdbd844d6c 100644 --- a/build/pkgs/giac/distros/arch.txt +++ b/build/pkgs/giac/distros/arch.txt @@ -1 +1 @@ -libgiac +libgiac giac diff --git a/build/pkgs/giac/distros/debian.txt b/build/pkgs/giac/distros/debian.txt index 95d5a01a1e6..90d00c5f5a9 100644 --- a/build/pkgs/giac/distros/debian.txt +++ b/build/pkgs/giac/distros/debian.txt @@ -1 +1,2 @@ libgiac-dev +xcas diff --git a/build/pkgs/giac/distros/fedora.txt b/build/pkgs/giac/distros/fedora.txt index d3451656a62..214358dd7fd 100644 --- a/build/pkgs/giac/distros/fedora.txt +++ b/build/pkgs/giac/distros/fedora.txt @@ -1 +1,2 @@ giac +giac-devel From 4cf38df769c483d69773f080fa15dfd9e91fc9ad Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 12 Aug 2020 19:49:57 -0700 Subject: [PATCH 5/6] build/pkgs/giac/spkg-configure.m4: Reject giac >= 1.6 --- build/pkgs/giac/spkg-configure.m4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4 index 4e68e6ae2b8..b3145c64a49 100644 --- a/build/pkgs/giac/spkg-configure.m4 +++ b/build/pkgs/giac/spkg-configure.m4 @@ -2,12 +2,15 @@ SAGE_SPKG_CONFIGURE([giac], [ SAGE_SPKG_DEPCHECK([pari], [ dnl giac does not seem to reveal its patchlevel m4_pushdef([GIAC_MIN_VERSION], [1.5.0]) - AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION, [ac_cv_path_GIAC], [ + m4_pushdef([GIAC_MAX_VERSION], [1.5.999]) + AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [ AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [ giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1) AS_IF([test -n "$giac_version"], [ AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [ - ac_cv_path_GIAC="$ac_path_GIAC" + AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [ + ac_cv_path_GIAC="$ac_path_GIAC" + ]) ]) ]) ]) From 0df15df93e049a8383d0e49bc2af06f618a42cc3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 10 Sep 2020 10:36:03 -0700 Subject: [PATCH 6/6] build/pkgs/giac/distros/conda.txt: New --- build/pkgs/giac/distros/conda.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/giac/distros/conda.txt diff --git a/build/pkgs/giac/distros/conda.txt b/build/pkgs/giac/distros/conda.txt new file mode 100644 index 00000000000..d3451656a62 --- /dev/null +++ b/build/pkgs/giac/distros/conda.txt @@ -0,0 +1 @@ +giac