diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml index d3b7801c548..43f20aa526b 100644 --- a/.github/workflows/ci-linux-incremental.yml +++ b/.github/workflows/ci-linux-incremental.yml @@ -83,7 +83,7 @@ jobs: from_docker_target: "with-targets" from_docker_tag: "dev" docker_targets: "with-targets" - targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest" + targets: "${{needs.changed_files.outputs.uninstall_targets}} reconfigure ${{needs.changed_files.outputs.build_targets}} build doc-html ptest" tox_system_factors: >- ["ubuntu-focal", "ubuntu-jammy", @@ -119,7 +119,7 @@ jobs: from_docker_target: "with-targets" from_docker_tag: "dev" docker_targets: "with-targets" - targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest" + targets: "${{needs.changed_files.outputs.uninstall_targets}} reconfigure ${{needs.changed_files.outputs.build_targets}} build doc-html ptest" # Only test systems with a usable system python (>= 3.9) # with only a small number of test failures as of 10.2.rc0 tox_system_factors: >- diff --git a/Makefile b/Makefile index ae90db4e9e2..ad82d467a80 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,9 @@ SPKG_COLLECT_FILES = build/pkgs/*/type build/pkgs/*/package-version.txt build/pk # If configure was run before, rerun it with the old arguments. # Otherwise, run configure with argument $PREREQ_OPTIONS. build/make/Makefile: configure $(SPKG_COLLECT_FILES) $(CONFIG_FILES:%=%.in) + $(MAKE) reconfigure + +reconfigure: rm -f config.log mkdir -p logs/pkgs ln -s logs/pkgs/config.log config.log @@ -339,7 +342,7 @@ list: @$(MAKE) --silent build/make/Makefile >&2 @$(MAKE) --silent -f build/make/Makefile SAGE_PKGCONFIG=dummy $@ -.PHONY: default build dist install micro_release \ +.PHONY: default build dist install micro_release reconfigure \ misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \ test check testoptional testall testlong testoptionallong testallong \ ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \ diff --git a/m4/sage_spkg_collect.m4 b/m4/sage_spkg_collect.m4 index 0ceb34a76eb..a7ac312368b 100644 --- a/m4/sage_spkg_collect.m4 +++ b/m4/sage_spkg_collect.m4 @@ -434,7 +434,7 @@ $COMMAND hint: After installation, re-run configure using: - \$ ./config.status --recheck && ./config.status + \$ make reconfigure ]) ], [ AC_MSG_NOTICE([No equivalent system packages for $SYSTEM are known to Sage]) diff --git a/src/doc/en/developer/portability_testing.rst b/src/doc/en/developer/portability_testing.rst index 0ad863f4e0f..c4a4bd5df31 100644 --- a/src/doc/en/developer/portability_testing.rst +++ b/src/doc/en/developer/portability_testing.rst @@ -230,7 +230,7 @@ following:: configure: hint: installing the following system packages is recommended and may avoid building some of the above SPKGs from source: configure: $ sudo apt-get install libflint-arb-dev ... libzmq3-dev libz-dev configure: After installation, re-run configure using: - configure: $ ./config.status --recheck && ./config.status + configure: $ make reconfigure This information comes from Sage's database of equivalent distribution packages. For example::