Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop' of git://github.com/sagemath/sage into public/…
Browse files Browse the repository at this point in the history
…build/inplace_ext
  • Loading branch information
tobiasdiez committed Oct 26, 2021
2 parents a257621 + 056b8d4 commit 89bc3ee
Show file tree
Hide file tree
Showing 606 changed files with 6,119 additions and 5,366 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cygwin-minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
cygwin-stage-i-b:
env:
STAGE: i-b
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cygwin-standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
cygwin-stage-i-b:
env:
STAGE: i-b
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing nose certifi pkgconfig pplpy
TARGETS: cython setuptools_scm kiwisolver dateutil cycler pyparsing certifi pkgconfig pplpy
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/tox-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ jobs:
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
DOCKER_TARGETS: configured with-targets with-targets-optional
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
# Test all non-dummy experimental packages, but do not test huge packages
# and do not test packages that require external software
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -147,7 +149,9 @@ jobs:
env:
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
# Test all non-dummy experimental packages, but do not test huge packages
# and do not test packages that require external software
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
steps:
- uses: actions/checkout@v2
- name: Select Xcode version
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tox-optional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
DOCKER_TARGETS: configured with-targets with-targets-optional
# Test all optional packages, but do not test huge packages,
# Test all non-dummy optional packages, but do not test huge packages
# and do not test packages that require external software
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -149,9 +149,9 @@ jobs:
env:
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
# Test all optional packages, but do not test huge packages
# Test all non-dummy optional packages, but do not test huge packages
# and do not test packages that require external software
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
steps:
- uses: actions/checkout@v2
- name: Select Xcode version
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ src/*.egg-info/
/src/bin/sage-src-env-config

# Virtual environments
/venv
src/.env
src/.venv
src/env/
Expand Down
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"description": "Mirror of the Sage https://sagemath.org/ source tree",
"license": "other-open",
"title": "sagemath/sage: 9.5.beta3",
"version": "9.5.beta3",
"title": "sagemath/sage: 9.5.beta4",
"version": "9.5.beta4",
"upload_type": "software",
"publication_date": "2021-10-11",
"publication_date": "2021-10-19",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta3",
"identifier": "https://github.com/sagemath/sage/tree/9.5.beta4",
"relation": "isSupplementTo"
},
{
Expand Down
1 change: 0 additions & 1 deletion COPYING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ mistune Modified BSD
mpc LGPLv3+
mpfi COPYING is GPLv2, source files state LGPLv2.1+
mpfr LGPLv3+
mpir LGPLv3+
mpmath Modified BSD
networkx Modified BSD
ntl GPLv2+
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ distclean: build-clean
@echo "Deleting all remaining output from build system ..."
rm -rf local
rm -f src/bin/sage-env-config
rm -f prefix venv

# Delete all auto-generated files which are distributed as part of the
# source tarball
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 9.5.beta3, Release Date: 2021-10-11
SageMath version 9.5.beta4, Release Date: 2021-10-19
9 changes: 7 additions & 2 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,13 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
case "$pkgname" in
_*) ;;
*) spkg_configures="$spkg_configures
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])" ;;
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
# Trac #31163: Not just an optional dummy package
spkg_configures="$spkg_configures
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])"
fi
;;
esac
fi
done
Expand Down
3 changes: 3 additions & 0 deletions build/bin/sage-print-system-package-command
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ case $system:$command in
pip:install)
[ -n "$system_packages" ] && print_shell_command "sage -pip install $system_packages"
;;
cpan:install)
[ -n "$system_packages" ] && print_shell_command "cpan -i $system_packages"
;;
repology:install)
if [ -n "$system_packages" ]; then
links=""
Expand Down
1 change: 1 addition & 0 deletions build/bin/sage-spkg-info
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ if [ $have_repology = yes ]; then
systems="$systems repology"
fi
for system in $systems; do
system_package_file="$PKG_DISTROS"/$system.txt
system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
case $system in
debian)
Expand Down
8 changes: 4 additions & 4 deletions build/bin/write-dockerfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ ARG NUMPROC=8
ENV MAKE="make -j\${NUMPROC}"
ARG USE_MAKEFLAGS="-k V=0"
ENV SAGE_CHECK=warn
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
#:toolchain:
$RUN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN
Expand All @@ -228,7 +228,7 @@ ARG NUMPROC=8
ENV MAKE="make -j\${NUMPROC}"
ARG USE_MAKEFLAGS="-k V=0"
ENV SAGE_CHECK=warn
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
#:make:
ARG TARGETS_PRE="all-sage-local"
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN
Expand All @@ -238,7 +238,7 @@ ARG NUMPROC=8
ENV MAKE="make -j\${NUMPROC}"
ARG USE_MAKEFLAGS="-k V=0"
ENV SAGE_CHECK=warn
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
ADD src src
ARG TARGETS="build"
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN
Expand All @@ -248,7 +248,7 @@ ARG NUMPROC=8
ENV MAKE="make -j\${NUMPROC}"
ARG USE_MAKEFLAGS="-k V=0"
ENV SAGE_CHECK=warn
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!rpy2,!symengine_py,!sage_sws2rst"
ENV SAGE_CHECK_PACKAGES="!gfan,!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
ARG TARGETS_OPTIONAL="ptest"
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN
Expand Down
27 changes: 21 additions & 6 deletions build/make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SPKG_INST_RELDIR = var/lib/sage/installed
# Aliases for mutually exclusive standard packages selected at configure time
TOOLCHAIN = @SAGE_TOOLCHAIN@
PYTHON = python3
MP_LIBRARY = @SAGE_MP_LIBRARY@
MP_LIBRARY = gmp
BLAS = openblas

# pkgconfig files generated/installed at build time
Expand Down Expand Up @@ -535,8 +535,10 @@ $(1)-$(4)-no-deps:
$(1)-no-deps: $(1)-$(4)-no-deps

$(1)-$(4)-clean:
sage-spkg-uninstall $(if $(filter $(1),$(TOOLCHAIN_DEPS)),--keep-files) \
$(1) '$$($(4))'
if [ -d '$$($(4))' ]; then \
sage-spkg-uninstall $(if $(filter $(1),$(TOOLCHAIN_DEPS)),--keep-files) \
$(1) '$$($(4))'; \
fi

$(1)-clean: $(1)-$(4)-clean

Expand Down Expand Up @@ -630,16 +632,29 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
$(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)

$(1)-$(4)-no-deps:
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
@if [ -x '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' ]; then \
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
. '$$(SAGE_ROOT)/src/bin/sage-env' && \
. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
SAGE_INST_LOCAL=$$($(4)) \
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log'
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
else \
echo; \
echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
echo "to provide information about equivalent system packages."; \
echo "It cannot be installed using the Sage distribution."; \
echo "Please install it manually, for example using the system packages"; \
echo "recommended at the end of a run of './configure'"; \
echo "See below for package-specific information."; \
echo; \
$$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
exit 1; \
fi

$(1)-no-deps: $(1)-$(4)-no-deps

Expand Down
11 changes: 0 additions & 11 deletions build/pkgs/arb/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,3 @@ Upstream Contact
- https://arblib.org/

- http://github.com/fredrik-johansson/arb/

Dependencies
------------

- FLINT
- MPIR or GMP
- MPFR


Special Update/Build Instructions
---------------------------------
2 changes: 1 addition & 1 deletion build/pkgs/backcall/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core toml
$(PYTHON) | $(PYTHON_TOOLCHAIN) flit_core tomli

----------
All lines of this file are ignored except the first.
Expand Down
5 changes: 0 additions & 5 deletions build/pkgs/cddlib/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,3 @@ Upstream Contact
----------------

https://github.com/cddlib/cddlib

Dependencies
------------

- gmp (or its fork mpir)
2 changes: 1 addition & 1 deletion build/pkgs/cddlib/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SAGE_SPKG_CONFIGURE([cddlib], [
SAGE_SPKG_DEPCHECK([gmp mpir], [
SAGE_SPKG_DEPCHECK([gmp], [
dnl The sage library uses BOTH cddexec and cddexec_gmp.
dnl These two executables were introduced in cddlib-094j.
AC_CHECK_PROGS([CDDEXEC], [cddexec])
Expand Down
11 changes: 0 additions & 11 deletions build/pkgs/cocoalib/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,3 @@ Upstream Contact
- Email: cocoa@dima.unige.it
- Website: http://cocoa.dima.unige.it/
- Releases: http://cocoa.dima.unige.it/cocoalib/

Dependencies
------------

- GMP/MPIR


Special Update/Build Instructions
---------------------------------

None.
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=9c45053634b6912dd4e4e68a483b5dbd483fc47d
md5=11496f4636f7c19bb4cfbaf6e57af698
cksum=2205302326
sha1=1df4c487d374a7ea9eeda3a9234cc6eed81c1443
md5=83d4327261e545f26d4ad318030823e8
cksum=2968565921
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
32c0d4075fb515a073925ad1feefcc4fc349b47d
e8ab458165ec5e5832adf702099f47f4cff94596
2 changes: 1 addition & 1 deletion build/pkgs/cvxopt/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig nose matplotlib
$(PYTHON) numpy $(BLAS) gsl glpk suitesparse | $(PYTHON_TOOLCHAIN) pkgconfig matplotlib $(and $(filter-out no,$(SAGE_CHECK_cvxopt)), pytest)

matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.

Expand Down
7 changes: 1 addition & 6 deletions build/pkgs/cvxopt/spkg-check.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
cd src

if ! command -v nosetests ; then
echo >&2 'Testing cvxopt requires the package nose to be installed'
exit 1
fi

nosetests
pytest
7 changes: 0 additions & 7 deletions build/pkgs/e_antic/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,3 @@ Upstream Contact
----------------

- https://github.com/videlec/e-antic

Dependencies
------------

- GMP/MPIR
- FLINT
- ARB
2 changes: 1 addition & 1 deletion build/pkgs/ecl/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SAGE_SPKG_CONFIGURE([ecl], [
# Default to installing the SPKG
sage_spkg_install_ecl=yes
SAGE_SPKG_DEPCHECK([gcc gc gmp mpir], [
SAGE_SPKG_DEPCHECK([gcc gc gmp], [
AC_PATH_PROG([ECL_CONFIG], [ecl-config])
AS_IF([test x$ECL_CONFIG != x], [
# "CPPFLAGS" is not a typo, the --cflags output from
Expand Down
12 changes: 2 additions & 10 deletions build/pkgs/ecm/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ Upstream Contact

- ecm-discuss@lists.gforge.inria.fr (requires subscription)

Dependencies
------------

- GMP/MPIR (Note: Python is \*not\* required for ordinary builds.)
- GNU patch


Special Update/Build Instructions
---------------------------------

Expand All @@ -47,11 +40,10 @@ Special Update/Build Instructions
Note that this doesn't affect the packages' selection of processor-
specific optimized [assembly] code.
'spkg-install' already reads the settings from Sage's and also a
system-wide GMP / MPIR now, but doesn't (yet) use all of them.
system-wide GMP now, but doesn't (yet) use all of them.
If SAGE_FAT_BINARY="yes", we should avoid too specific settings of
"-mcpu=...", and perhaps pass a more generic "--host=..." to
'configure'. (MPIR honors '--enable-fat' to some extent, but this
option isn't used on anything other than x86 / x86_64.)
'configure'.

- We currently work around a linker bug on MacOS X 10.5 PPC (with
GCC 4.2.1) which breaks 'configure' if debug symbols are enabled.
Expand Down
10 changes: 2 additions & 8 deletions build/pkgs/ecm/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
SAGE_SPKG_CONFIGURE([ecm], [
m4_pushdef([SAGE_ECM_MINVER],[7.0.4])
AC_REQUIRE([SAGE_SPKG_CONFIGURE_GMP])
AC_MSG_CHECKING([installing gmp/mpir? ])
if test x$sage_spkg_install_mpir = xyes -o x$sage_spkg_install_gmp = xyes; then
AC_MSG_RESULT([yes; install ecm as well])
sage_spkg_install_ecm=yes
else
AC_MSG_RESULT([no. ])
SAGE_SPKG_DEPCHECK([gmp], [
AC_CHECK_HEADER(ecm.h, [
AX_ABSOLUTE_HEADER([ecm.h])
if test x$gl_cv_absolute_ecm_h = x; then
Expand Down Expand Up @@ -38,6 +32,6 @@ SAGE_SPKG_CONFIGURE([ecm], [
AS_IF([test -z "$ac_cv_ECM"], [sage_spkg_install_ecm=yes])
AS_IF([test -z "$ac_cv_ECMBIN"], [sage_spkg_install_ecm=yes])
], [sage_spkg_install_ecm=yes])
fi
])
m4_popdef([SAGE_ECM_MINVER])
])
4 changes: 1 addition & 3 deletions build/pkgs/fflas_ffpack/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
SAGE_SPKG_CONFIGURE([fflas_ffpack], [
# fflas-lapack uses whatever multi-precision library givaro uses,
# either gmp or mpir.
SAGE_SPKG_DEPCHECK([givaro gmp mpir openblas], [
SAGE_SPKG_DEPCHECK([givaro gmp openblas], [
# If our dependencies come from the system, then we can use
# the system fflas-ffpack, too. Use pkg-config to find a
# recentish version, if there is one.
Expand Down
Loading

0 comments on commit 89bc3ee

Please sign in to comment.