Skip to content

Commit

Permalink
gh-35830: Bliss spkg config
Browse files Browse the repository at this point in the history
    
Provide spkg-config for bliss, with minimal version 0.77.

Depends on #35344, where Sage's bliss is bumped to 0.77
with the necessary API changes.

Fixes #35829
    
URL: #35830
Reported by: Dima Pasechnik
Reviewer(s): Dima Pasechnik, Matthias Köppe
  • Loading branch information
Release Manager committed Dec 4, 2023
2 parents 69b0671 + 75c1cca commit 9bc8977
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 5 deletions.
5 changes: 0 additions & 5 deletions build/pkgs/bliss/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions build/pkgs/bliss/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bliss
2 changes: 2 additions & 0 deletions build/pkgs/bliss/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bliss
bliss-devel
27 changes: 27 additions & 0 deletions build/pkgs/bliss/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -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 <bliss/defs.hh>
]],[[
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])
])

0 comments on commit 9bc8977

Please sign in to comment.