[ptxdist] [PATCH] rules: Replace deprecated <PKG>_COMPILE_ENV

[ptxdist] [PATCH] rules: Replace deprecated <PKG>_COMPILE_ENV

[Ladislav Michl]

From: Ladislav Michl <ladis@linux-mips.org>

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/host-nodejs.make | 2 +-
 rules/libpcap.make     | 2 +-
 rules/pcmciautils.make | 2 +-
 rules/poppler.make     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make
index 6da85be2c..2bf5f7971 100644
--- a/rules/host-nodejs.make
+++ b/rules/host-nodejs.make
@@ -13,7 +13,7 @@
 HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs
 
 # Always run the preprocessor locally.
-HOST_NODEJS_COMPILE_ENV	:= \
+HOST_NODEJS_MAKE_ENV	:= \
 	ICECC_REMOTE_CPP=0
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libpcap.make b/rules/libpcap.make
index ae7292fed..1d51449ae 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -31,7 +31,7 @@ LIBPCAP_CONF_ENV  := \
 	$(CROSS_ENV) \
 	ac_cv_lbl_hci_channel_monitor_is_defined=no
 
-LIBPCAP_COMPILE_ENV := \
+LIBPCAP_MAKE_ENV := \
 	$(CROSS_ENV_CFLAGS) \
 	$(CROSS_ENV_CPPFLAGS) \
 	$(CROSS_ENV_LDFLAGS) \
diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make
index 6dc358c89..e9328a589 100644
--- a/rules/pcmciautils.make
+++ b/rules/pcmciautils.make
@@ -27,7 +27,7 @@ PCMCIAUTILS_DIR		:= $(BUILDDIR)/$(PCMCIAUTILS)
 # Prepare
 # ----------------------------------------------------------------------------
 
-PCMCIAUTILS_COMPILE_ENV := \
+PCMCIAUTILS_MAKE_ENV := \
 	$(CROSS_ENV_CFLAGS) \
 	$(CROSS_ENV_CPPFLAGS) \
 	$(CROSS_ENV_LDFLAGS)
diff --git a/rules/poppler.make b/rules/poppler.make
index d56e2601b..9679ccc65 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -78,7 +78,7 @@ POPPLER_CONF_OPT	:= \
 	-DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF)
 
 ifdef PTXCONF_POPPLER_QT5
-POPPLER_COMPILE_ENV := \
+POPPLER_MAKE_ENV := \
 	ICECC_REMOTE_CPP=0
 endif
 
-- 
2.32.0

Re: [ptxdist] [APPLIED] rules: Replace deprecated <PKG>_COMPILE_ENV

[Michael Olbrich]

Thanks, applied as e7cdee2e88afe21bfaa2f7c49ac0bc0c5213c6eb.

Michael

[sent from post-receive hook]

On Fri, 28 Oct 2022 16:44:08 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <Y052XhXNyRUXtQRM@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make
> index 6da85be2cad5..2bf5f7971891 100644
> --- a/rules/host-nodejs.make
> +++ b/rules/host-nodejs.make
> @@ -13,7 +13,7 @@
>  HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs
>  
>  # Always run the preprocessor locally.
> -HOST_NODEJS_COMPILE_ENV	:= \
> +HOST_NODEJS_MAKE_ENV	:= \
>  	ICECC_REMOTE_CPP=0
>  
>  # ----------------------------------------------------------------------------
> diff --git a/rules/libpcap.make b/rules/libpcap.make
> index ae7292fed15c..1d51449aec8f 100644
> --- a/rules/libpcap.make
> +++ b/rules/libpcap.make
> @@ -31,7 +31,7 @@ LIBPCAP_CONF_ENV  := \
>  	$(CROSS_ENV) \
>  	ac_cv_lbl_hci_channel_monitor_is_defined=no
>  
> -LIBPCAP_COMPILE_ENV := \
> +LIBPCAP_MAKE_ENV := \
>  	$(CROSS_ENV_CFLAGS) \
>  	$(CROSS_ENV_CPPFLAGS) \
>  	$(CROSS_ENV_LDFLAGS) \
> diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make
> index c9330f6bae6d..d05fc7b7e60c 100644
> --- a/rules/pcmciautils.make
> +++ b/rules/pcmciautils.make
> @@ -27,7 +27,7 @@ PCMCIAUTILS_DIR		:= $(BUILDDIR)/$(PCMCIAUTILS)
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -PCMCIAUTILS_COMPILE_ENV := \
> +PCMCIAUTILS_MAKE_ENV := \
>  	$(CROSS_ENV_CFLAGS) \
>  	$(CROSS_ENV_CPPFLAGS) \
>  	$(CROSS_ENV_LDFLAGS)
> diff --git a/rules/poppler.make b/rules/poppler.make
> index d56e2601bba0..9679ccc65a6c 100644
> --- a/rules/poppler.make
> +++ b/rules/poppler.make
> @@ -78,7 +78,7 @@ POPPLER_CONF_OPT	:= \
>  	-DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF)
>  
>  ifdef PTXCONF_POPPLER_QT5
> -POPPLER_COMPILE_ENV := \
> +POPPLER_MAKE_ENV := \
>  	ICECC_REMOTE_CPP=0
>  endif
>