Thanks, applied as 59febb48bdae2b5bcc9d9a186a4cb6482edc5f17. Michael
[sent from post-receive hook] On Fri, 28 Oct 2022 16:44:12 +0200, Ladislav Michl <oss-li...@triops.cz> wrote: > Signed-off-by: Ladislav Michl <la...@linux-mips.org> > Message-Id: <Y0/5xdFZO3u0952+@lenoch> > [mol: update explicit user of JVISU_ENV] > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/at.make b/rules/at.make > index 7a4da8f5a9b8..c7089d156b8d 100644 > --- a/rules/at.make > +++ b/rules/at.make > @@ -31,7 +31,7 @@ AT_LICENSE_FILES := \ > # Prepare > # > ---------------------------------------------------------------------------- > > -AT_ENV := \ > +AT_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_header_security_pam_appl_h=$(call ptx/yesno, PTXCONF_GLOBAL_PAM) > > diff --git a/rules/bonniexx.make b/rules/bonniexx.make > index b0c69be8b885..70f98e8bccf0 100644 > --- a/rules/bonniexx.make > +++ b/rules/bonniexx.make > @@ -30,7 +30,7 @@ BONNIEXX_LICENSE_FILES := \ > # Prepare > # > ---------------------------------------------------------------------------- > > -BONNIEXX_ENV := \ > +BONNIEXX_CONF_ENV := \ > $(CROSS_ENV) \ > bonnie_cv_sys_largefile=$(call ptx/yesno, PTXCONF_GLOBAL_LARGE_FILE) > > diff --git a/rules/fontconfig.make b/rules/fontconfig.make > index 6c45bad668c1..925e036493f5 100644 > --- a/rules/fontconfig.make > +++ b/rules/fontconfig.make > @@ -33,7 +33,7 @@ FONTCONFIG_LICENSE_FILES := \ > # Prepare > # > ---------------------------------------------------------------------------- > > -FONTCONFIG_ENV := \ > +FONTCONFIG_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_prog_HASDOCBOOK=no > > diff --git a/rules/gnupg.make b/rules/gnupg.make > index 99e7f776aa3c..a2c33212c923 100644 > --- a/rules/gnupg.make > +++ b/rules/gnupg.make > @@ -36,12 +36,12 @@ GNUPG_LICENSE_FILES := \ > # Prepare > # > ---------------------------------------------------------------------------- > > -GNUPG_ENV := \ > +GNUPG_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/bin/gpgrt-config > > -GNUPG_CONF_TOOL := autoconf > -GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > +GNUPG_CONF_TOOL := autoconf > +GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > --disable-gpgsm \ > --disable-scdaemon \ > --disable-g13 \ > diff --git a/rules/grub.make b/rules/grub.make > index a85321172e68..63b93c2d7ba9 100644 > --- a/rules/grub.make > +++ b/rules/grub.make > @@ -28,7 +28,7 @@ GRUB_DIR := $(BUILDDIR)/$(GRUB) > # non-standard CFLAGS. We can unset them here as grub is compiled > # standalone anyway (without Linux/glibc includes) > > -GRUB_ENV := $(CROSS_ENV) CFLAGS='' > +GRUB_CONF_ENV := $(CROSS_ENV) CFLAGS='' > > GRUB_CFLAGS := -fgnu89-inline > > diff --git a/rules/host-cairo.make b/rules/host-cairo.make > index 6936b9bc2893..092641e25920 100644 > --- a/rules/host-cairo.make > +++ b/rules/host-cairo.make > @@ -15,8 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_CAIRO) += host-cairo > # Prepare > # > ---------------------------------------------------------------------------- > > -#HOST_CAIRO_CONF_ENV := $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make > index 579c3274e974..4996695c0cec 100644 > --- a/rules/host-libxcb.make > +++ b/rules/host-libxcb.make > @@ -15,7 +15,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBXCB) += host-libxcb > # Prepare > # > ---------------------------------------------------------------------------- > > -HOST_LIBXCB_ENV := \ > +HOST_LIBXCB_CONF_ENV := \ > $(HOST_ENV) \ > ac_cv_prog_BUILD_DOCS=no \ > ac_cv_lib_Xdmcp_XdmcpWrap=no > diff --git a/rules/host-openssl.make b/rules/host-openssl.make > index f80b4e1c9f8d..bd2a2512645b 100644 > --- a/rules/host-openssl.make > +++ b/rules/host-openssl.make > @@ -23,8 +23,6 @@ HOST_OPENSSL_DIR = $(HOST_BUILDDIR)/$(HOST_OPENSSL) > # Prepare > # > ---------------------------------------------------------------------------- > > -HOST_OPENSSL_CONF_ENV := $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-opkg.make b/rules/host-opkg.make > index a8cae57ce031..a9fe3d20a363 100644 > --- a/rules/host-opkg.make > +++ b/rules/host-opkg.make > @@ -22,8 +22,6 @@ HOST_OPKG_DIR = $(HOST_BUILDDIR)/$(HOST_OPKG) > # Prepare > # > ---------------------------------------------------------------------------- > > -HOST_OPKG_ENV := $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-postgresql.make b/rules/host-postgresql.make > index 1092c38a8b1c..c9c92a40b27a 100644 > --- a/rules/host-postgresql.make > +++ b/rules/host-postgresql.make > @@ -15,8 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_POSTGRESQL) += host-postgresql > # Prepare > # > ---------------------------------------------------------------------------- > > -#HOST_POSTGRESQL_CONF_ENV := $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-python3.make b/rules/host-python3.make > index 4bccd21d7ac7..f40141ac1732 100644 > --- a/rules/host-python3.make > +++ b/rules/host-python3.make > @@ -24,7 +24,7 @@ HOSTPYTHON3 = > $(PTXDIST_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) > # > ---------------------------------------------------------------------------- > > # Note: the LDFLAGS are used by setup.py for manual searches > -HOST_PYTHON3_ENV := \ > +HOST_PYTHON3_CONF_ENV := \ > $(HOST_ENV) \ > ac_sys_system=Linux \ > ac_sys_release=2 \ > diff --git a/rules/jvisu.make b/rules/jvisu.make > index f82047ad17a4..849aa6d5c527 100644 > --- a/rules/jvisu.make > +++ b/rules/jvisu.make > @@ -29,7 +29,7 @@ JVISU_DIR := $(BUILDDIR)/$(JVISU) > > > JVISU_PATH := PATH=$(PTXCONF_SETUP_JAVA_SDK)/bin:$(CROSS_PATH) > -JVISU_ENV := \ > +JVISU_MAKE_ENV := \ > $(CROSS_ENV) \ > ANT_OPTS="-Dfile.encoding=iso-8859-1" \ > JAVA_HOME=$(PTXCONF_SETUP_JAVA_SDK) > @@ -44,7 +44,7 @@ $(STATEDIR)/jvisu.prepare: > > $(STATEDIR)/jvisu.compile: > @$(call targetinfo) > - cd $(JVISU_DIR) && $(JVISU_ENV) $(JVISU_PATH) /bin/bash ./build.sh jar > + @$(call world/execute, JVISU, $(SHELL) ./build.sh jar) > @$(call touch) > > # > ---------------------------------------------------------------------------- > diff --git a/rules/sdl2-test.make b/rules/sdl2-test.make > index 8529bf2e7d82..f5ecd9354879 100644 > --- a/rules/sdl2-test.make > +++ b/rules/sdl2-test.make > @@ -28,7 +28,7 @@ SDL2_TESTS_LICENSE := zlib > # Prepare > # > ---------------------------------------------------------------------------- > > -SDL2_TEST_ENV := \ > +SDL2_TEST_CONF_ENV := \ > $(CROSS_ENV) \ > SDL_LIBS="-lSDL2 -lunwind -lunwind-generic" > > diff --git a/rules/valgrind.make b/rules/valgrind.make > index ad71e33ee2a6..130f92136f7e 100644 > --- a/rules/valgrind.make > +++ b/rules/valgrind.make > @@ -42,7 +42,7 @@ ifdef KERNEL_HEADER_VERSION > VALGRIND_KERNEL_VERSION := $(KERNEL_HEADER_VERSION) > endif > > -VALGRIND_ENV := \ > +VALGRIND_CONF_ENV := \ > $(CROSS_ENV) \ > valgrind_cv_sys_kernel_version=$(VALGRIND_KERNEL_VERSION) > > diff --git a/rules/wget.make b/rules/wget.make > index 67ed77982c55..70023f20f41c 100644 > --- a/rules/wget.make > +++ b/rules/wget.make > @@ -30,7 +30,7 @@ WGET_LICENSE_FILES := \ > # Prepare > # > ---------------------------------------------------------------------------- > > -WGET_ENV := \ > +WGET_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_prog_MAKEINFO=: \ > ac_cv_path_PERL=: \
