diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-06 11:06:41 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-07 14:04:53 +0100 |
commit | 9bd2c40818f4a37beae2234260ba396ddc4d55bc (patch) | |
tree | 7026856c03e5e8c3bb1bfecfbd13527935a1ef43 | |
parent | b4e5edcec38b2cfe0c170bb095674d7bec782873 (diff) | |
download | ptxdist-9bd2c40818f4a37beae2234260ba396ddc4d55bc.tar.gz ptxdist-9bd2c40818f4a37beae2234260ba396ddc4d55bc.tar.xz |
rules: use _MAKE_ENV instead of deprecated _COMPILE_ENV
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/bustle.make | 2 | ||||
-rw-r--r-- | rules/cpufrequtils.make | 2 | ||||
-rw-r--r-- | rules/dnsmasq.make | 2 | ||||
-rw-r--r-- | rules/gst-plugins-good1.make | 2 | ||||
-rw-r--r-- | rules/host-qt5.make | 2 | ||||
-rw-r--r-- | rules/latencytop.make | 2 | ||||
-rw-r--r-- | rules/memtester.make | 2 | ||||
-rw-r--r-- | rules/pciutils.make | 2 | ||||
-rw-r--r-- | rules/qt5.make | 2 | ||||
-rw-r--r-- | rules/qwt5.make | 2 | ||||
-rw-r--r-- | rules/sched_switch.make | 2 | ||||
-rw-r--r-- | rules/unstrung.make | 2 | ||||
-rw-r--r-- | rules/utelnetd.make | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/rules/bustle.make b/rules/bustle.make index b820ab144..83abc8833 100644 --- a/rules/bustle.make +++ b/rules/bustle.make @@ -30,7 +30,7 @@ BUSTLE_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later # ---------------------------------------------------------------------------- BUSTLE_PATH := PATH=$(CROSS_PATH) -BUSTLE_COMPILE_ENV := $(CROSS_ENV) +BUSTLE_MAKE_ENV := $(CROSS_ENV) $(STATEDIR)/bustle.prepare: @$(call targetinfo) diff --git a/rules/cpufrequtils.make b/rules/cpufrequtils.make index 01d810067..1ac470619 100644 --- a/rules/cpufrequtils.make +++ b/rules/cpufrequtils.make @@ -29,7 +29,7 @@ CPUFREQUTILS_DIR := $(BUILDDIR)/$(CPUFREQUTILS) # ---------------------------------------------------------------------------- CPUFREQUTILS_PATH := PATH=$(CROSS_PATH) -CPUFREQUTILS_COMPILE_ENV := $(CROSS_ENV) +CPUFREQUTILS_MAKE_ENV := $(CROSS_ENV) CPUFREQUTILS_MAKEVARS := \ NLS=false \ V=true \ diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index 116304567..5d04f7ec2 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -31,7 +31,7 @@ DNSMASQ_DIR := $(BUILDDIR)/$(DNSMASQ) # ---------------------------------------------------------------------------- DNSMASQ_PATH := PATH=$(CROSS_PATH) -DNSMASQ_COMPILE_ENV := $(CROSS_ENV) +DNSMASQ_MAKE_ENV := $(CROSS_ENV) DNSMASQ_COPT := diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make index e63d858d4..008bc9a92 100644 --- a/rules/gst-plugins-good1.make +++ b/rules/gst-plugins-good1.make @@ -162,7 +162,7 @@ GST_PLUGINS_GOOD1_CONF_OPT += --disable-$(subst $(space),$(space)--disable-,$(s endif ifdef PTXCONF_GST_PLUGINS_GOOD1_QT -GST_PLUGINS_GOOD1_COMPILE_ENV := \ +GST_PLUGINS_GOOD1_MAKE_ENV := \ ICECC_REMOTE_CPP=0 endif diff --git a/rules/host-qt5.make b/rules/host-qt5.make index 2a3d09262..5b724b8ec 100644 --- a/rules/host-qt5.make +++ b/rules/host-qt5.make @@ -150,7 +150,7 @@ HOST_QT5_CONF_OPT += \ HOST_QT5_QT_CONF := $(PTXDIST_SYSROOT_HOST)/bin/qt5/qt.conf -HOST_QT5_COMPILE_ENV := \ +HOST_QT5_MAKE_ENV := \ ICECC_REMOTE_CPP=0 $(STATEDIR)/host-qt5.install.post: diff --git a/rules/latencytop.make b/rules/latencytop.make index 18d8ba7a8..edc50aeae 100644 --- a/rules/latencytop.make +++ b/rules/latencytop.make @@ -31,7 +31,7 @@ LATENCYTOP_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- LATENCYTOP_CONF_TOOL := NO -LATENCYTOP_COMPILE_ENV := $(CROSS_ENV_FLAGS) +LATENCYTOP_MAKE_ENV := $(CROSS_ENV_FLAGS) LATENCYTOP_MAKE_OPT := \ $(CROSS_ENV_CC) \ HAS_GTK_GUI= diff --git a/rules/memtester.make b/rules/memtester.make index 916f1fde9..551ad8662 100644 --- a/rules/memtester.make +++ b/rules/memtester.make @@ -31,7 +31,7 @@ MEMTESTER_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- MEMTESTER_PATH := PATH=$(CROSS_PATH) -MEMTESTER_COMPILE_ENV := $(CROSS_ENV) +MEMTESTER_MAKE_ENV := $(CROSS_ENV) $(STATEDIR)/memtester.prepare: @$(call targetinfo) diff --git a/rules/pciutils.make b/rules/pciutils.make index d4b735900..6ef7e14f7 100644 --- a/rules/pciutils.make +++ b/rules/pciutils.make @@ -31,7 +31,7 @@ PCIUTILS_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- PCIUTILS_CONF_TOOL := NO -PCIUTILS_COMPILE_ENV := $(CROSS_ENV) +PCIUTILS_MAKE_ENV := $(CROSS_ENV) PCIUTILS_MAKE_OPT := \ CROSS_COMPILE=$(COMPILER_PREFIX) \ diff --git a/rules/qt5.make b/rules/qt5.make index cf12e3754..29adda436 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -241,7 +241,7 @@ else QT5_QMAKE_OPT += "QT_CONFIG-=gstreamer-0.10 gstreamer-1.0" endif -QT5_COMPILE_ENV := \ +QT5_MAKE_ENV := \ ICECC_REMOTE_CPP=0 $(STATEDIR)/qt5.prepare: diff --git a/rules/qwt5.make b/rules/qwt5.make index eec1515be..8b0be3cc6 100644 --- a/rules/qwt5.make +++ b/rules/qwt5.make @@ -38,7 +38,7 @@ ifdef PTXCONF_QWT5_SVG QWT5_CONF_OPT += QWT5_CONFIG+=QwtSvg endif -QWT5_COMPILE_ENV := \ +QWT5_MAKE_ENV := \ ICECC_REMOTE_CPP=0 # ---------------------------------------------------------------------------- diff --git a/rules/sched_switch.make b/rules/sched_switch.make index 99c07f89d..8bdab0659 100644 --- a/rules/sched_switch.make +++ b/rules/sched_switch.make @@ -30,7 +30,7 @@ SCHED_SWITCH_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- SCHED_SWITCH_CONF_TOOL := NO -SCHED_SWITCH_COMPILE_ENV:= $(CROSS_ENV_FLAGS) +SCHED_SWITCH_MAKE_ENV := $(CROSS_ENV_FLAGS) SCHED_SWITCH_MAKE_OPT := $(CROSS_ENV_CC) SCHED_SWITCH_INSTALL_OPT:= \ $(SCHED_SWITCH_MAKE_OPT) \ diff --git a/rules/unstrung.make b/rules/unstrung.make index 287d11975..0baa00eaa 100644 --- a/rules/unstrung.make +++ b/rules/unstrung.make @@ -30,7 +30,7 @@ UNSTRUNG_LICENSE := GPL-2.0-or-later # ---------------------------------------------------------------------------- UNSTRUNG_CONF_TOOL := NO -UNSTRUNG_COMPILE_ENV := \ +UNSTRUNG_MAKE_ENV := \ $(CROSS_ENV) \ ARCH=$(PTXCONF_ARCH_STRING) \ EMBEDDED=$(call ptx/ifdef,PTXCONF_UNSTRUNG_TESTING,,1) diff --git a/rules/utelnetd.make b/rules/utelnetd.make index b1e36e2d8..f1cab2811 100644 --- a/rules/utelnetd.make +++ b/rules/utelnetd.make @@ -26,7 +26,7 @@ UTELNETD_DIR := $(BUILDDIR)/$(UTELNETD) # Compile # ---------------------------------------------------------------------------- -UTELNETD_COMPILE_ENV := \ +UTELNETD_MAKE_ENV := \ CROSS_COMPILE=$(COMPILER_PREFIX) \ $(CROSS_ENV_FLAGS) |