Skip to content

Commit fef52de

Browse files
author
Release Manager
committed
sagemathgh-35830: Bliss spkg config Provide spkg-config for bliss, with minimal version 0.77. Depends on sagemath#35344, where Sage's bliss is bumped to 0.77 with the necessary API changes. Fixes sagemath#35829 URL: sagemath#35830 Reported by: Dima Pasechnik Reviewer(s): Dima Pasechnik, Matthias Köppe
2 parents 484d4a8 + 75c1cca commit fef52de

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

build/pkgs/bliss/SPKG.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,3 @@ https://users.aalto.fi/~tjunttil/bliss/index.html
2323
Bliss used to be maintained by Tommi Junttila and Petteri Kaski up to version 0.73 at
2424

2525
http://www.tcs.tkk.fi/Software/bliss/index.html
26-
27-
Dependencies
28-
------------
29-
30-
None
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bliss
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bliss
2+
bliss-devel

build/pkgs/bliss/spkg-configure.m4

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
SAGE_SPKG_CONFIGURE([bliss], [
2+
m4_pushdef([SAGE_BLISS_MINVER],[0.77])
3+
m4_pushdef([SAGE_BLISS_MAJOR],[0])
4+
m4_pushdef([SAGE_BLISS_MINOR],[77])
5+
AC_CHECK_HEADER([bliss/bliss_C.h], [
6+
AC_SEARCH_LIBS([bliss_new], [bliss], [
7+
AC_MSG_CHECKING([checking bliss version directly])
8+
AC_RUN_IFELSE([AC_LANG_PROGRAM([
9+
[#include <bliss/defs.hh>
10+
]],[[
11+
if (BLISS_VERSION_MAJOR > ]] SAGE_BLISS_MAJOR [[ ) return 0;
12+
if (BLISS_VERSION_MAJOR == ]] SAGE_BLISS_MAJOR [[ &&
13+
BLISS_VERSION_MINOR >= ]] SAGE_BLISS_MINOR [[ ) return 0;
14+
else return 1;
15+
]])],
16+
[AC_MSG_RESULT([Good.])],
17+
[AC_MSG_RESULT([Too old.])
18+
sage_spkg_install_bliss=yes],
19+
[]) dnl cross-compilation - noop
20+
],
21+
[sage_spkg_install_bliss=yes])
22+
], [sage_spkg_install_bliss=yes])
23+
m4_popdef([SAGE_BLISS_MINVER])
24+
m4_popdef([SAGE_BLISS_MAJOR])
25+
m4_popdef([SAGE_BLISS_MINOR])
26+
])
27+

0 commit comments

Comments
 (0)