From ff033d374785594e9b1c70d16e640ab69801399d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 24 Jul 2024 08:23:24 +0100 Subject: [PATCH] build/pkgs/macaulay2/dependencies: Add cmake, ninja --- build/pkgs/macaulay2/dependencies | 2 +- build/pkgs/macaulay2/spkg-install.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build/pkgs/macaulay2/dependencies b/build/pkgs/macaulay2/dependencies index a9ec737239e..d83e5c7b90d 100644 --- a/build/pkgs/macaulay2/dependencies +++ b/build/pkgs/macaulay2/dependencies @@ -1,4 +1,4 @@ -4ti2 fflas_ffpack gfortran boost_cropped cddlib libffi givaro glpk $(MP_LIBRARY) $(BLAS) liblzma mpc mpfi mpfr ncurses ntl readline singular libxml2 zlib lrslib normaliz pkgconf topcom polymake git gfan frobby nauty libnauty flint onetbb +4ti2 fflas_ffpack gfortran boost_cropped cddlib libffi givaro glpk $(MP_LIBRARY) $(BLAS) liblzma mpc mpfi mpfr ncurses ntl readline singular libxml2 zlib lrslib normaliz topcom polymake git gfan frobby nauty libnauty flint onetbb | cmake ninja pkgconf # other needed packages according to https://github.com/Macaulay2/M2/blob/master/M2/INSTALL: # autoconf bison cohomcalg curl emacs flex install-info libboost-math-dev libboost-regex-dev libboost-stacktrace-dev libgdbm-dev libgivaro-dev libglpk-dev libgtest-dev libmps-dev libtool lsb-release npm openssh-server pinentry-curses time unzip xbase-clients yasm dpkg-dev libeigen3-dev libtool-bin coinor-csdp coinor-csdp-doc diff --git a/build/pkgs/macaulay2/spkg-install.in b/build/pkgs/macaulay2/spkg-install.in index 4011362d369..763ac9ff6fd 100644 --- a/build/pkgs/macaulay2/spkg-install.in +++ b/build/pkgs/macaulay2/spkg-install.in @@ -1 +1,6 @@ +cd src + # https://github.com/Macaulay2/M2/blob/master/M2/INSTALL-CMake.md +cd M2/M2/BUILD/build +sdh_cmake -GNinja -S../.. -B. \ + -DCMAKE_BUILD_TYPE=Release