Skip to content

Commit 472121b

Browse files
author
Release Manager
committed
gh-36415: README: Recommend `configure --config-cache --enable-ccache` <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This can save a bit of time for developers, although only a fraction of our configure tests are cached. Also removes mention of `--enable-download-from-upstream-url`, which has been the default for a while now. Also reducing some excessive messages from spkg-configure <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36415 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
2 parents 8327845 + 39db606 commit 472121b

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

README.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,18 @@ in the Installation Guide.
319319

320320
$ ./configure --help
321321

322-
A notable option for Sage developers is the following:
323-
324-
- Use `./configure --enable-download-from-upstream-url` to allow
325-
downloading packages from their upstream URL if they cannot (yet) be
326-
found on the Sage mirrors. This is useful for trying out ticket branches
327-
that make package upgrades.
322+
Notable options for Sage developers are the following:
323+
324+
- Use the option `--config-cache` to have `configure`
325+
keep a disk cache of configuration values. This gives a nice speedup
326+
when trying out ticket branches that make package upgrades, which
327+
involves automatic re-runs of the configuration step.
328+
329+
- Use the option `--enable-ccache` to have Sage install and use the
330+
optional package `ccache`, which is preconfigured to keep a
331+
disk cache of object files created from source files. This can give
332+
a great speedup when switching between different branches, at the
333+
expense of disk space use.
328334

329335
10. Optional, but highly recommended: Set some environment variables to
330336
customize the build.

build/pkgs/glpk/spkg-configure.m4

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,15 @@ SAGE_SPKG_CONFIGURE([glpk], [
88
glpk_ver=`$GLPSOL --version | grep ^GLPSOL | $SED -e 's/GLPSOL.*ver, v//g' 2>> config.log`
99
AX_COMPARE_VERSION([$glpk_ver], [ge], [$SAGE_GLPK_MINVER], [
1010
AC_CHECK_HEADER([glpk.h], [], [sage_spkg_install_glpk=yes])
11-
AC_SEARCH_LIBS([glp_config], [glpk],
12-
[AC_MSG_RESULT([yes. Use system's glpk])], [
13-
AC_MSG_RESULT([no. Install glpk])
14-
sage_spkg_install_glpk=yes])dnl end-AC_SEARCH_LIBS
15-
], [sage_spkg_install_glpk=yes])dnl end-AX_COMPARE_VERSION
11+
AC_SEARCH_LIBS([glp_config], [glpk], [], [sage_spkg_install_glpk=yes])dnl end-AC_SEARCH_LIBS
12+
], [sage_spkg_install_glpk=yes])dnl end-AX_COMPARE_VERSION
1613
])dnl end-AS_IF
1714
])
1815
m4_popdef([SAGE_GLPK_MINVER])
1916
], [], [], [
2017
AS_IF([test x$sage_spkg_install_glpk = xyes], [
2118
AC_SUBST(SAGE_GLPK_PREFIX, ['$SAGE_LOCAL'])
22-
AC_MSG_RESULT([using Sage's glpk SPKG])], [
19+
], [
2320
AC_SUBST(SAGE_GLPK_PREFIX, [''])
24-
AC_MSG_RESULT([using glpk from the system])])
21+
])
2522
])

build/pkgs/mpc/spkg-configure.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ SAGE_SPKG_CONFIGURE([mpc], [
77
], [], [], [
88
if test x$sage_spkg_install_mpc = xyes; then
99
AC_SUBST(SAGE_MPC_PREFIX, ['$SAGE_LOCAL'])
10-
AC_MSG_RESULT([using Sage's mpc SPKG])
1110
else
1211
AC_SUBST(SAGE_MPC_PREFIX, [''])
13-
AC_MSG_RESULT([using mpc library from the system])
1412
fi
1513
])

build/pkgs/mpfr/spkg-configure.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ SAGE_SPKG_CONFIGURE([mpfr], [
77
], [], [], [
88
if test x$sage_spkg_install_mpfr = xyes; then
99
AC_SUBST(SAGE_MPFR_PREFIX, ['$SAGE_LOCAL'])
10-
AC_MSG_RESULT([using Sage's mpfr SPKG])
1110
else
1211
AC_SUBST(SAGE_MPFR_PREFIX, [''])
13-
AC_MSG_RESULT([using mpfr library from the system])
1412
fi
1513
])

build/pkgs/pkgconf/spkg-configure.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ SAGE_SPKG_CONFIGURE(
44
AS_IF([test -z "$PKG_CONFIG"], [
55
sage_spkg_install_pkgconf=yes
66
AC_SUBST(SAGE_PKG_CONFIG_PATH, [''])
7-
AC_MSG_RESULT([installing pkgconf spkg])], [
7+
], [
88
dnl the following as needed as long as Sage creates .pc files during build and/or configure
99
AC_SUBST(SAGE_PKG_CONFIG_PATH, ['$SAGE_LOCAL/lib/pkgconfig'])
10-
AC_MSG_RESULT([using pkg-config from the system])
1110
])
1211
])

0 commit comments

Comments
 (0)