From 7e3d4c16bd8a708aa38f1ddccc5b8dd79e1b472f Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sun, 25 Jun 2023 13:12:55 +0100 Subject: [PATCH 1/4] spkg-config for bliss, with a version check etc --- build/pkgs/bliss/distros/fedora.txt | 2 ++ build/pkgs/bliss/spkg-configure.m4 | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 build/pkgs/bliss/distros/fedora.txt create mode 100644 build/pkgs/bliss/spkg-configure.m4 diff --git a/build/pkgs/bliss/distros/fedora.txt b/build/pkgs/bliss/distros/fedora.txt new file mode 100644 index 00000000000..681ebb3f402 --- /dev/null +++ b/build/pkgs/bliss/distros/fedora.txt @@ -0,0 +1,2 @@ +bliss +bliss-devel diff --git a/build/pkgs/bliss/spkg-configure.m4 b/build/pkgs/bliss/spkg-configure.m4 new file mode 100644 index 00000000000..4c75013ac27 --- /dev/null +++ b/build/pkgs/bliss/spkg-configure.m4 @@ -0,0 +1,29 @@ +SAGE_SPKG_CONFIGURE([bliss], [ + m4_pushdef([SAGE_BLISS_MINVER],[0.77]) + m4_pushdef([SAGE_BLISS_MAJOR],[0]) + m4_pushdef([SAGE_BLISS_MINOR],[77]) + SAGE_SPKG_DEPCHECK([cmake], [ + AC_CHECK_HEADER([bliss/bliss_C.h], [ + AC_SEARCH_LIBS([bliss_new], [bliss], [ + AC_MSG_CHECKING([checking bliss version directly]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([ + [#include + ]],[[ + if (BLISS_VERSION_MAJOR > ]] SAGE_BLISS_MAJOR [[ ) return 0; + if (BLISS_VERSION_MAJOR == ]] SAGE_BLISS_MAJOR [[ && + BLISS_VERSION_MINOR >= ]] SAGE_BLISS_MINOR [[ ) return 0; + else return 1; + ]])], + [AC_MSG_RESULT([Good.])], + [AC_MSG_RESULT([Too old.]) + sage_spkg_install_bliss=yes], + []) dnl cross-compilation - noop + ], + [sage_spkg_install_bliss=yes]) + ], [sage_spkg_install_bliss=yes]) + ]) + m4_popdef([SAGE_BLISS_MINVER]) + m4_popdef([SAGE_BLISS_MAJOR]) + m4_popdef([SAGE_BLISS_MINOR]) +]) + From 0ad40ea39dbbedc74f31ee5b57aa89f976612633 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 28 Jun 2023 09:05:48 +0100 Subject: [PATCH 2/4] no need for empty deps section --- build/pkgs/bliss/SPKG.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/pkgs/bliss/SPKG.rst b/build/pkgs/bliss/SPKG.rst index 77407f16ac7..8abc6975ddf 100644 --- a/build/pkgs/bliss/SPKG.rst +++ b/build/pkgs/bliss/SPKG.rst @@ -23,8 +23,3 @@ https://users.aalto.fi/~tjunttil/bliss/index.html Bliss used to be maintained by Tommi Junttila and Petteri Kaski up to version 0.73 at http://www.tcs.tkk.fi/Software/bliss/index.html - -Dependencies ------------- - -None From dd30a2a026bc8e74dafbd86196acfceda6c449c0 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Wed, 28 Jun 2023 09:10:27 +0100 Subject: [PATCH 3/4] no need to check for external cmake --- build/pkgs/bliss/spkg-configure.m4 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/pkgs/bliss/spkg-configure.m4 b/build/pkgs/bliss/spkg-configure.m4 index 4c75013ac27..052d6d1e5e3 100644 --- a/build/pkgs/bliss/spkg-configure.m4 +++ b/build/pkgs/bliss/spkg-configure.m4 @@ -2,8 +2,7 @@ SAGE_SPKG_CONFIGURE([bliss], [ m4_pushdef([SAGE_BLISS_MINVER],[0.77]) m4_pushdef([SAGE_BLISS_MAJOR],[0]) m4_pushdef([SAGE_BLISS_MINOR],[77]) - SAGE_SPKG_DEPCHECK([cmake], [ - AC_CHECK_HEADER([bliss/bliss_C.h], [ + AC_CHECK_HEADER([bliss/bliss_C.h], [ AC_SEARCH_LIBS([bliss_new], [bliss], [ AC_MSG_CHECKING([checking bliss version directly]) AC_RUN_IFELSE([AC_LANG_PROGRAM([ @@ -20,8 +19,7 @@ SAGE_SPKG_CONFIGURE([bliss], [ []) dnl cross-compilation - noop ], [sage_spkg_install_bliss=yes]) - ], [sage_spkg_install_bliss=yes]) - ]) + ], [sage_spkg_install_bliss=yes]) m4_popdef([SAGE_BLISS_MINVER]) m4_popdef([SAGE_BLISS_MAJOR]) m4_popdef([SAGE_BLISS_MINOR]) From 75c1ccaa4b01c14ad725f3a6aca7d8844e653179 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 9 Oct 2023 12:49:19 +0100 Subject: [PATCH 4/4] alpine distinfo for bliss --- build/pkgs/bliss/distros/alpine.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/bliss/distros/alpine.txt diff --git a/build/pkgs/bliss/distros/alpine.txt b/build/pkgs/bliss/distros/alpine.txt new file mode 100644 index 00000000000..d90d94bbcc3 --- /dev/null +++ b/build/pkgs/bliss/distros/alpine.txt @@ -0,0 +1 @@ +bliss