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 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 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..052d6d1e5e3 --- /dev/null +++ b/build/pkgs/bliss/spkg-configure.m4 @@ -0,0 +1,27 @@ +SAGE_SPKG_CONFIGURE([bliss], [ + m4_pushdef([SAGE_BLISS_MINVER],[0.77]) + m4_pushdef([SAGE_BLISS_MAJOR],[0]) + m4_pushdef([SAGE_BLISS_MINOR],[77]) + 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]) +]) +