Skip to content

Commit

Permalink
Trac #29413: Meta-ticket: Upgrade cddlib, fix cddlib header search fo…
Browse files Browse the repository at this point in the history
…r packages latte_int, gfan, topcom

Follow up from #28905.

We upgrade to 0.94m: https://repology.org/project/cddlib/versions

- `latte_int`: #31482
- `singular`: #25993
- `gfan` : #32243
- `topcom`: #31531
- `polymake`: #28435
- `cddlib`: #30319, #34634
- make singular pick sage's cdd (if installed):
Singular/Singular#1064

URL: https://trac.sagemath.org/29413
Reported by: mkoeppe
Ticket author(s): Dima Pasechnik
Reviewer(s): Matthias Koeppe
  • Loading branch information
Release Manager committed Oct 11, 2022
2 parents be3b5ab + 0c27c4f commit 364b605
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
4 changes: 1 addition & 3 deletions build/pkgs/cddlib/distros/homebrew.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# Until https://trac.sagemath.org/ticket/29413 is done, we cannot use homebrew's cddlib,
# which already uses the new upstream include header locations.
#cddlib
cddlib
11 changes: 2 additions & 9 deletions build/pkgs/cddlib/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,8 @@ EOF
AC_MSG_RESULT([yes])
])
])
dnl Recent versions (>= 0.94k) of cddlib put these headers in
dnl a "cddlib" subdirectory, and Debian currently relocates them
dnl under "cdd". But for now they're at the top-level, in e.g.
dnl /usr/include/cdd.h. The lattE and gfan packages within
dnl SageMath both look for them there, so that's where we have to
dnl check, passing up a chance to detect cddlib on Fedora and Debian
dnl for now. Once all of cddlib's consumers know about the new (or
dnl both) locations, we can update this check to support them.
dnl See https://trac.sagemath.org/ticket/29413
dnl Recent versions (>= 0.94k) of cddlib put cddlib's headers in
dnl a "cddlib" subdirectory.
AC_CHECK_HEADER([cddlib/cdd.h],[],[sage_spkg_install_cddlib=yes],[
#include <cddlib/setoper.h>
#include <cddlib/cddmp.h>
Expand Down

0 comments on commit 364b605

Please sign in to comment.