Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit 43bb6f1

Browse files
committed
workaround needed for building Sage 8.9 due to changes in the fflas-ffpack spkg-install
as noted in the comment we need a mechanism for specifying any special build flags on a per-version basis, though right now realistically we only ever build the latest version--no one clamors for new builds of older Sage versions
1 parent 6c6e4fa commit 43bb6f1

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Makefile

+10-7
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,25 @@ SAGE_ROOT_RUNTIME=$(ENV_RUNTIME_DIR)$(SAGE_ROOT)
5555

5656
N_CPUS=$(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
5757

58-
# Note: Be very careful about quoting here; we need literal
58+
# TODO: These variables should be made dependent on the Sage version being
59+
# built, as we may need to change this from version to version. In practice
60+
# though we usually just care about building the latest version.
61+
# NOTE: The latest version, 8.8, still does not work with system GMP.
62+
SAGE_CONFIGURE_FLAGS:=--with-blas=atlas --with-mp=mpir
63+
64+
# NOTE: Be very careful about quoting here; we need literal
5965
# quotes or else they will be stripped when exec'ing bash
66+
# NOTE: FFLAS_FFPACK_CONFIGURE is needed to work around a regression introduced
67+
# in Sage 8.9: https://trac.sagemath.org/ticket/27444#comment:34
6068
SAGE_ENVVARS:=\
6169
SAGE_NUM_THREADS=$(N_CPUS) \
6270
SAGE_INSTALL_CCACHE=yes \
6371
CCACHE_DIR=\"$(HOME)/.ccache\" \
6472
SAGE_FAT_BINARY=yes \
6573
SAGE_ATLAS_LIB=/lib \
74+
FFLAS_FFPACK_CONFIGURE=--disable-openmp \
6675
MAKE=\"make -j$(N_CPUS)\"
6776

68-
# TODO: This shoud be made dependent on the Sage version being built, as we may
69-
# need to change this from version to version. In practice though we usually
70-
# just care about building the latest version.
71-
# Note: The latest version, 8.8, still does not work with system GMP.
72-
SAGE_CONFIGURE_FLAGS:=--with-blas=atlas --with-mp=mpir
73-
7477
# Outputs representing success in the Sage build process
7578
SAGE_CONFIGURE=$(SAGE_ROOT_BUILD)/configure
7679
SAGE_MAKEFILE=$(SAGE_ROOT_BUILD)/build/make/Makefile

0 commit comments

Comments
 (0)