autotools: do not overwrite first include path
RFC PATCH 1/1 autotools: do not overwrite first include path
The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct:
configure.ac: AC_CONFIG_MACRO_DIR([m4])
Makefile.am: ACLOCAL_AMFLAGS="-I m4"
If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
Don't use the "-I" option in aclocal. Instead use ACLOCAL_PATH to pass the system-wide include dirs.
As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the ACLOCAL_HOST_DIR system include path.
autoreconf will pass the "-I" options to every tool it runs. So move the argument to each individual tool except aclocal.
--- package/autoconf/autoconf.mk | 6 +++--- package/automake/automake.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
package/autoconf/autoconf.mk +3 -3
@@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool $(eval $(host-autotools-package)) # variables used by other packages -AUTOCONF = $(HOST_DIR)/bin/autoconf -AUTOHEADER = $(HOST_DIR)/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
package/automake/automake.mk +1 -1
@@ -32,4 +32,4 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOMAKE = $(HOST_DIR)/bin/automake ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal -ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR) +ACLOCAL = ACLOCAL_PATH="$(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)" $(HOST_DIR)/bin/aclocal
Signature · 1 line
2.20.1
RFC PATCH 1/1 autotools: do not overwrite first include path
Hi,
Quoted 16 lines · Michael Walle
The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct:
configure.ac:
AC_CONFIG_MACRO_DIR([m4])
Makefile.am: ACLOCAL_AMFLAGS="-I m4"If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663Don't use the "-I" option in aclocal. Instead use
ACLOCAL_PATHto pass the system-wide include dirs.
Quoted 8 lines
As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the
ACLOCAL_HOST_DIRsystem include path.autoreconf will pass the "-I" options to every tool it runs. So move the argument to each individual tool except aclocal.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>
I made a test by removing the $(pkg)_POST_PATCH_HOOKS for the following packages:
- atest
- davici
- libscsi
- ltrace
- minicom
- open-lldp
- openpgm
- pdbg
The result is that all this packages still build without this hook.
--
Heiko
RFC PATCH 1/1 autotools: do not overwrite first include path
Hi All,
Am Do., 12. Dez. 2019 um 11:08 Uhr schrieb Heiko Thiery <[email protected]>:
Quoted 41 lines
Hi,
Quoted 16 lines · Michael Walle
The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct:
configure.ac:
AC_CONFIG_MACRO_DIR([m4])
Makefile.am: ACLOCAL_AMFLAGS="-I m4"If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663Don't use the "-I" option in aclocal. Instead use
ACLOCAL_PATHto pass the system-wide include dirs.Quoted 8 lines
As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the
ACLOCAL_HOST_DIRsystem include path.autoreconf will pass the "-I" options to every tool it runs. So move the argument to each individual tool except aclocal.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>I made a test by removing the $(pkg)_POST_PATCH_HOOKS for the following packages:
- atest
- davici
- libscsi
- ltrace
- minicom
- open-lldp
- openpgm
- pdbg
Quoted 4 lines
The result is that all this packages still build without this hook.
--
Heiko
Has anyone the time to take a look on it and give a comment?
BR
Heiko
RFC PATCH 1/1 autotools: do not overwrite first include path
In reply to Michael WalleQuoted 34 lines · Michael Walle
The first include path is special in aclocal. For example it is the path for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the following construct:
configure.ac:
AC_CONFIG_MACRO_DIR([m4])
Makefile.am: ACLOCAL_AMFLAGS="-I m4"If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663Don't use the "-I" option in aclocal. Instead use
ACLOCAL_PATHto pass the system-wide include dirs.As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the
ACLOCAL_HOST_DIRsystem include path.autoreconf will pass the "-I" options to every tool it runs. So move the argument to each individual tool except aclocal.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>--- package/autoconf/autoconf.mk | 6 +++--- package/automake/automake.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)package/autoconf/autoconf.mk +0
-0
package/autoconf/autoconf.mk HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool · line 26
Quoted 9 lines
package/autoconf/autoconf.mk +3
-3@@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool $(eval $(host-autotools-package)) # variables used by other packages -AUTOCONF = $(HOST_DIR)/bin/autoconf -AUTOHEADER = $(HOST_DIR)/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
This will expand to:
... ACLOCAL="ACLOCAL_PATH="$(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)" $(HOST_DIR)/bin/aclocal" AUTOCONF=...
(I've only done one level of expansion, but is shows my point.) So the quotation marks are screwed up a little.
It does work because the space is still quoted, and the quotes around theACLOCAL_PATH value are actually redundant (because spaces in directories are not supported). But it looks a little weird.
That said, I wonder: why don't we simply export ACLOCAL_PATH? I think with
that, we don't need the -I options in autoheader and autoconf any more, right?
Regards,
Arnout
Quoted 11 lines
package/automake/automake.mk +1
-1@@ -32,4 +32,4 @@ $(eval $(host-autotools-package)) # variables used by other packages AUTOMAKE = $(HOST_DIR)/bin/automake ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal -ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR) +ACLOCAL = ACLOCAL_PATH="$(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)" $(HOST_DIR)/bin/aclocal
RFC PATCH 1/1 autotools: do not overwrite first include path
Hi Arnout,
Am 2020-01-14 00:37, schrieb Arnout Vandecappelle:
Quoted 60 lines · Michael Walle
Quoted 49 lines
The first include path is special in aclocal. For example it is the path
for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the
following construct:configure.ac:
AC_CONFIG_MACRO_DIR([m4])
Makefile.am: ACLOCAL_AMFLAGS="-I m4"If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663Don't use the "-I" option in aclocal. Instead use
ACLOCAL_PATHto pass the system-wide include dirs.As a side effect this should fix the use of $(ACLOCAL) alone. Up until now, $(ACLOCAL) didn't include the
ACLOCAL_HOST_DIRsystem include path.autoreconf will pass the "-I" options to every tool it runs. So move the
argument to each individual tool except aclocal.Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>--- package/autoconf/autoconf.mk | 6 +++--- package/automake/automake.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)package/autoconf/autoconf.mk +0
-3@@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool $(eval $(host-autotools-package)) # variables used by other packages -AUTOCONF = $(HOST_DIR)/bin/autoconf -AUTOHEADER = $(HOST_DIR)/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)"AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf
package/autoconf/autoconf.mk +1
-1-f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -IQuoted 7 lines
"$(ACLOCAL_HOST_DIR)"
+AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -iThis will expand to:
Quoted 6 lines
... ACLOCAL="ACLOCAL_PATH="$(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)" $(HOST_DIR)/bin/aclocal" AUTOCONF=...
(I've only done one level of expansion, but is shows my point.) So the quotation
marks are screwed up a little.
nice catch.
Quoted 11 lines
It does work because the space is still quoted, and the quotes around
theACLOCAL_PATHvalue are actually redundant (because spaces in directories are not
supported). But it looks a little weird.That said, I wonder: why don't we simply export
ACLOCAL_PATH? I think
with
that, we don't need the -I options in autoheader and autoconf any more, right?
You mean something like that:
ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR) ACLOCAL_PATH = $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)
AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL_PATH="$(ACLOCAL_PATH)" ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
That won't work if $(ACLOCAL) is used alone. But from what I see that isn't
used for now. So we could give that a try.
Or rather something like that:
ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR) ACLOCAL_PATH = $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR) export ACLOCAL_PATH
AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
But that would clutter the variable ACLOCAL_PATH and no other package exports variables.
-michael
RFC PATCH 1/1 autotools: do not overwrite first include path
Am 2020-01-14 11:52, schrieb Michael Walle:
Quoted 81 lines
Hi Arnout,
Am 2020-01-14 00:37, schrieb Arnout Vandecappelle:
Quoted 62 lines · Michael Walle
Quoted 51 lines
The first include path is special in aclocal. For example it is the path
for the --install option. Also, the first include is treated in a special way if it doesn't exists. This might be the case if there is the
following construct:configure.ac:
AC_CONFIG_MACRO_DIR([m4])
Makefile.am: ACLOCAL_AMFLAGS="-I m4"If the package doesn't have local macros, the m4/ directory might not exist. aclocal will then just issue a warning instead of aborting the execution with a fatal error. See discussion here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663Don't use the "-I" option in aclocal. Instead use
ACLOCAL_PATHto pass
the system-wide include dirs.As a side effect this should fix the use of $(ACLOCAL) alone. Up until
now, $(ACLOCAL) didn't include theACLOCAL_HOST_DIRsystem include path.autoreconf will pass the "-I" options to every tool it runs. So move the
argument to each individual tool except aclocal.Signed-off-by Michael Walle <[email protected]>Signed-off-by Heiko Thiery <[email protected]>--- package/autoconf/autoconf.mk | 6 +++--- package/automake/automake.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)package/autoconf/autoconf.mk +0
-3@@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool $(eval $(host-autotools-package)) # variables used by other packages -AUTOCONF = $(HOST_DIR)/bin/autoconf -AUTOHEADER = $(HOST_DIR)/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)"AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf
package/autoconf/autoconf.mk +1
-1-f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" +AUTOCONF = $(HOST_DIR)/bin/autoconf -I "$(ACLOCAL_DIR)" -IQuoted 7 lines
"$(ACLOCAL_HOST_DIR)"
+AUTOHEADER = $(HOST_DIR)/bin/autoheader -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -iThis will expand to:
Quoted 6 lines
... ACLOCAL="ACLOCAL_PATH="$(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)" $(HOST_DIR)/bin/aclocal" AUTOCONF=...
(I've only done one level of expansion, but is shows my point.) So the quotation
marks are screwed up a little.nice catch.
Quoted 7 lines
It does work because the space is still quoted, and the quotes around
theACLOCAL_PATHvalue are actually redundant (because spaces in directories are not
supported). But it looks a little weird.
Quoted 8 lines
Quoted 4 lines
That said, I wonder: why don't we simply export
ACLOCAL_PATH? I think
with
that, we don't need the -I options in autoheader and autoconf any more, right?You mean something like that:
ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR)
whoops without the "-I $(ACLOCAL_DIR)" of course.
Quoted 7 lines
ACLOCAL_PATH= $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL_PATH="$(ACLOCAL_PATH)" ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
Quoted 6 lines
That won't work if $(ACLOCAL) is used alone. But from what I see that isn't
used for now. So we could give that a try.Or rather something like that:
ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR)
likewise.
Quoted 10 lines
ACLOCAL_PATH= $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)
exportACLOCAL_PATHAUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
But that would clutter the variable
ACLOCAL_PATHand no other package exports variables.
-michael
RFC PATCH 1/1 autotools: do not overwrite first include path
In reply to Michael WalleQuoted 3 lines · Michael Walle
Hi Arnout,
Am 2020-01-14 00:37, schrieb Arnout Vandecappelle:
[snip]
Quoted 15 lines
Quoted 2 lines
?That said, I wonder: why don't we simply export
ACLOCAL_PATH? I think with that, we don't need the -I options in autoheader and autoconf any more, right?You mean something like that:
ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR)
ACLOCAL_PATH= $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR)AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL_PATH="$(ACLOCAL_PATH)" ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
That won't work if $(ACLOCAL) is used alone. But from what I see that isn't used for now. So we could give that a try.
Quoted 8 lines
Or rather something like that:
ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR)ACLOCAL_PATH= $(ACLOCAL_DIR):$(ACLOCAL_HOST_DIR) exportACLOCAL_PATHAUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
This second one is what I meant. But of course, this only works if autoconf and
automake don't need the explicit -I options.
Quoted 1 line
But that would clutter the variable
ACLOCAL_PATH
That can actually be considered a good thing. If the user has set ACLOCAL_PATH,
we really do want to override it (we don't want to rely on anything from the host).
Quoted 1 line
and no other package exports variables.
Packages per se, indeed no, but this stuff can actually be considered part of
the infrastructure. They could just as well be defined in package/Makefile.in or package/pkg-autotools.mk.
A bunch of files are already exporting variables - particularlypackage/pkg-download.mk.
Regards,
Arnout
Quoted 2 lines
-michael