From 658e7626e54965669bf51e5e6d470d2638b1ac33 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:53 -0600 Subject: [PATCH] package/pkg-autotools: set AUTOPOINT via AUTOCONF_ENV 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 [Arnout: split long line] Signed-off-by: Arnout Vandecappelle --- package/autoconf/autoconf.mk | 5 ++++- package/pkg-autotools.mk | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 7e0850422b..15ce9d5927 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -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 diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 55d95d204e..418cd10945 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -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)