NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pkg-autotools: set AUTOPOINT via AUTOCONF_ENV

Browse Source 
Previously, AUTOPOINT was hardcoded to /bin/true in autoconf.mk.

Moving the definition of this variable into AUTOCONF_ENV as part of the
autotools infrastructure will allow us to conditionally set the variable
based on package flags to support migrating away from FOO_GETTEXTIZE.

While we're at it, split the overly long line that defines AUTORECONF,
wrapping at 80 columns.

Signed-off-by: Vincent Fazio <vfazio@gmail.com>
[Arnout: split long line]
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Vincent Fazio 2023-02-21 11:21:53 -06:00 committed by Arnout Vandecappelle
parent 067a69412a
commit 658e7626e5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/autoconf/autoconf.mk
View File

@ -23,4 +23,7 @@ $(eval $(host-autotools-package))
# variables used by other packages
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 GTKDOCIZE=/bin/true $(HOST_DIR)/bin/autoreconf -f -i
AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" \
AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" \
AUTOMAKE="$(AUTOMAKE)" GTKDOCIZE=/bin/true \
$(HOST_DIR)/bin/autoreconf -f -i

1
package/pkg-autotools.mk
View File

@ -241,6 +241,7 @@ ifeq ($$($(2)_GETTEXTIZE),YES)
$(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK
$(2)_DEPENDENCIES += host-gettext
endif
$(2)_AUTORECONF_ENV += AUTOPOINT=/bin/true
$(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK
# default values are not evaluated yet, so don't rely on this defaulting to YES
ifneq ($$($(2)_LIBTOOL_PATCH),NO)