From: Gregory Heytings <gregory@heytings.org>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 51965@debbugs.gnu.org
Subject: bug#51965: [PATCH] Pass options from make to configure
Date: Tue, 23 Nov 2021 10:01:48 +0000 [thread overview]
Message-ID: <890d44ded2532283ced5@heytings.org> (raw)
In-Reply-To: <877dd3qhkd.fsf@gnus.org>
[-- Attachment #1: Type: text/plain, Size: 977 bytes --]
>> A 'make' in a repository clone builds Emacs with the default
>> configuration options. It would be useful if those who want to build
>> Emacs with other configuration options they already know could do that
>> without going through the three-step ./autogen.sh; ./configure
>> <options>; make. Patch attached, with which it becomes possible to
>> just say e.g.:
>>
>> make configure=--with-x-toolkit=lucid
>
> That sounds useful -- but if we add this, perhaps the normal Makefile
> should also work this way? That would be useful when doing bootstraps
> with new configure options, which currently take two runs through
> configure, which is a bore. I.e.,
>
> make configure=--with-x-toolkit=lucid bootstrap
>
Indeed, that makes sense.
I attach a patch with which it is possible to say, with both the
GNUmakefile or the Makefile:
make bootstrap configure=--with-x-toolkit=lucid
and, to go back to the default configuration:
make bootstrap configure=default
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-diff; name=Pass-options-from-make-to-configure-through-a-variab.patch, Size: 3969 bytes --]
From dc486632e268226d8576fdd61005169497a72168 Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Tue, 23 Nov 2021 09:57:27 +0000
Subject: [PATCH] Pass options from make to configure through a variable.
* GNUmakefile (configure): Use the variable.
* Makefile (bootstrap): Act differently when the variable is set.
* INSTALL.REPO: Document the variable.
---
GNUmakefile | 5 +++++
INSTALL.REPO | 23 +++++++++++++++++++----
Makefile.in | 13 +++++++++++--
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 5155487de2..76fd77ba1b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -104,8 +104,13 @@ configure:
Makefile: configure
@echo >&2 'There seems to be no Makefile in this directory.'
+ifeq ($(configure),default)
@echo >&2 'Running ./configure ...'
./configure
+else
+ @echo >&2 'Running ./configure '$(configure)'...'
+ ./configure $(configure)
+endif
@echo >&2 'Makefile built.'
# 'make bootstrap' in a fresh checkout needn't run 'configure' twice.
diff --git a/INSTALL.REPO b/INSTALL.REPO
index da56d7611b..182c2e9534 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -8,9 +8,15 @@ directory on your local machine:
To build the repository code, simply run 'make' in the 'emacs'
directory. This should work if your files are freshly checked out
-from the repository, and if you have the proper tools installed. If
-it doesn't work, or if you have special build requirements, the
-following information may be helpful.
+from the repository, and if you have the proper tools installed; the
+default configuration options will be used. Other configuration
+options can be specified by setting a 'configure' variable, for
+example:
+
+ $ make configure="--prefix=/opt/emacs CFLAGS='-O0 -g3'"
+
+If the above doesn't work, or if you have special build requirements,
+the following information may be helpful.
Building Emacs from the source-code repository requires some tools
that are not needed when building from a release. You will need:
@@ -58,7 +64,16 @@ To update loaddefs.el (and similar files), do:
If either of the above partial procedures fails, try 'make bootstrap'.
If CPU time is not an issue, 'make bootstrap' is a more thorough way
-to rebuild, avoiding spurious problems.
+to rebuild, avoiding spurious problems. 'make bootstrap' rebuilds
+Emacs with the same configuration options as the previous build; it
+can also be used to rebuild Emacs with other configuration options by
+setting a 'configure' variable, for example:
+
+ $ make bootstrap configure="CFLAGS='-O0 -g3'"
+
+To rebuild Emacs with the default configuration options, you can use:
+
+ $ make bootstrap configure=default
Occasionally, there are changes that 'make bootstrap' won't be able to
handle. The most thorough cleaning can be achieved by 'git clean -fdx'
diff --git a/Makefile.in b/Makefile.in
index 3c092fa63d..4b40d8741d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1145,14 +1145,23 @@ check-info:
.PHONY: bootstrap
-# Bootstrapping does the following:
+# Without a 'configure' variable, bootstrapping does the following:
# * Remove files to start from a bootstrap-clean slate.
# * Run autogen.sh.
# * Rebuild Makefile, to update the build procedure itself.
# * Do the actual build.
-bootstrap: bootstrap-clean
+# With a 'configure' variable, bootstrapping does the following:
+# * Remove files to start from an extraclean slate.
+# * Do the actual build, during which the 'configure' variable is
+# used (see the Makefile goal in GNUmakefile).
+bootstrap:
+ifndef configure
+ $(MAKE) bootstrap-clean
cd $(srcdir) && ./autogen.sh autoconf
$(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile
+else
+ $(MAKE) extraclean
+endif
$(MAKE) all
.PHONY: ChangeLog change-history change-history-commit change-history-nocommit
--
2.33.0
next prev parent reply other threads:[~2021-11-23 10:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-19 9:11 bug#51965: [PATCH] Pass options from make to configure Gregory Heytings
2021-11-20 9:53 ` Lars Ingebrigtsen
2021-11-23 10:01 ` Gregory Heytings [this message]
2021-11-24 6:58 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=890d44ded2532283ced5@heytings.org \
--to=gregory@heytings.org \
--cc=51965@debbugs.gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).