From: Ladislav Michl <oss-lists@triops.cz>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] rules: Replace deprecated <PKG>_MAKEVARS
Date: Tue, 18 Oct 2022 11:47:50 +0200 [thread overview]
Message-ID: <Y052RiUsQnsOBet1@lenoch> (raw)
From: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/ckermit.make | 2 +-
rules/etherwake.make | 2 +-
rules/gdb.make | 2 +-
rules/host-libaio.make | 2 +-
rules/killproc.make | 2 +-
rules/libcgi.make | 2 +-
rules/liblockfile.make | 2 +-
rules/lpc21isp.make | 2 --
rules/module-init-tools.make | 2 +-
rules/netcat.make | 2 --
rules/pcmciautils.make | 2 +-
rules/pv.make | 2 +-
rules/wireless.make | 2 +-
13 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/rules/ckermit.make b/rules/ckermit.make
index e983803c1..2a6f08528 100644
--- a/rules/ckermit.make
+++ b/rules/ckermit.make
@@ -35,7 +35,7 @@ CKERMIT_CONF_TOOL := NO
# Compile
# ----------------------------------------------------------------------------
-CKERMIT_MAKEVARS := \
+CKERMIT_MAKE_OPT := \
xermit \
KTARGET=linuxa \
prefix=/usr \
diff --git a/rules/etherwake.make b/rules/etherwake.make
index 8ae6fd734..b5eb9eaf4 100644
--- a/rules/etherwake.make
+++ b/rules/etherwake.make
@@ -29,7 +29,7 @@ ETHERWAKE_LICENSE := GPL
# Prepare
# ----------------------------------------------------------------------------
-ETHERWAKE_MAKEVARS := CC=$(CROSS_CC)
+ETHERWAKE_MAKE_OPT := CC=$(CROSS_CC)
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/gdb.make b/rules/gdb.make
index 8d2c7ffdb..1eef9beb2 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -54,7 +54,7 @@ GDB_CONF_ENV := \
host_configargs='$(GDB_CONF_OPT_HOST)'
ifndef PTXCONF_GDB_SHARED
-GDB_MAKEVARS := LDFLAGS=-static
+GDB_MAKE_OPT := LDFLAGS=-static
endif
#
diff --git a/rules/host-libaio.make b/rules/host-libaio.make
index 4c428e477..251a4e68a 100644
--- a/rules/host-libaio.make
+++ b/rules/host-libaio.make
@@ -17,6 +17,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBAIO) += host-libaio
HOST_LIBAIO_CONF_TOOL := NO
HOST_LIBAIO_MAKE_ENV := $(HOST_ENV)
-HOST_LIBAIO_MAKEVARS := prefix=
+HOST_LIBAIO_MAKE_OPT := prefix=
# vim: syntax=make
diff --git a/rules/killproc.make b/rules/killproc.make
index 196d2a45c..17c649569 100644
--- a/rules/killproc.make
+++ b/rules/killproc.make
@@ -28,7 +28,7 @@ KILLPROC_LICENSE := GPL-2.0-only
# Prepare
# ----------------------------------------------------------------------------
-KILLPROC_MAKEVARS := \
+KILLPROC_MAKE_OPT := \
CC=$(CROSS_CC) \
SBINDIR=$(KILLPROC_PKGDIR)/usr/sbin \
UBINDIR=$(KILLPROC_PKGDIR)/usr/bin \
diff --git a/rules/libcgi.make b/rules/libcgi.make
index eb9d704d2..f761ebaed 100644
--- a/rules/libcgi.make
+++ b/rules/libcgi.make
@@ -34,7 +34,7 @@ LIBCGI_LICENSE := LGPL-2.1-only
LIBCGI_CONF_TOOL := autoconf
LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR)
-LIBCGI_MAKEVARS := $(CROSS_ENV_CC) $(CROSS_ENV_AR)
+LIBCGI_MAKE_OPT := $(CROSS_ENV_CC) $(CROSS_ENV_AR)
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index 0022c3320..20213203b 100644
--- a/rules/liblockfile.make
+++ b/rules/liblockfile.make
@@ -30,7 +30,7 @@ LIBLOCKFILE_LICENSE_FILES := file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868
# Prepare
# ----------------------------------------------------------------------------
-LIBLOCKFILE_MAKEVARS := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR)
+LIBLOCKFILE_MAKE_OPT := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR)
#
# autoconf
diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
index f18ad84ee..25d229080 100644
--- a/rules/lpc21isp.make
+++ b/rules/lpc21isp.make
@@ -29,8 +29,6 @@ LPC21ISP_LICENSE := GPL-3.0-or-later
# ----------------------------------------------------------------------------
LPC21ISP_CONF_TOOL := NO
-LPC21ISP_MAKE_ENV := $(CROSS_ENV)
-LPC21ISP_MAKEVARS := $(CROSS_ENV)
# ----------------------------------------------------------------------------
# Install
diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make
index eb8811b24..34e193a5d 100644
--- a/rules/module-init-tools.make
+++ b/rules/module-init-tools.make
@@ -28,7 +28,7 @@ MODULE_INIT_TOOLS_LICENSE := GPL-2.0-only
# Prepare
# ----------------------------------------------------------------------------
-MODULE_INIT_TOOLS_MAKEVARS := MAN5="" MAN8=""
+MODULE_INIT_TOOLS_MAKE_OPT := MAN5="" MAN8=""
#
# autoconf
diff --git a/rules/netcat.make b/rules/netcat.make
index 7dd209f61..6e5d046f6 100644
--- a/rules/netcat.make
+++ b/rules/netcat.make
@@ -29,8 +29,6 @@ NETCAT_LICENSE := BSD
# ----------------------------------------------------------------------------
NETCAT_CONF_TOOL := NO
-NETCAT_MAKEVARS := \
- $(CROSS_ENV)
# ----------------------------------------------------------------------------
# Install
diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make
index c9330f6ba..6dc358c89 100644
--- a/rules/pcmciautils.make
+++ b/rules/pcmciautils.make
@@ -32,7 +32,7 @@ PCMCIAUTILS_COMPILE_ENV := \
$(CROSS_ENV_CPPFLAGS) \
$(CROSS_ENV_LDFLAGS)
-PCMCIAUTILS_MAKEVARS := \
+PCMCIAUTILS_MAKE_OPT := \
prefix=/usr \
mandir=/usr/share/man \
CROSS=$(COMPILER_PREFIX) \
diff --git a/rules/pv.make b/rules/pv.make
index 1c6d67b17..0213816e9 100644
--- a/rules/pv.make
+++ b/rules/pv.make
@@ -26,7 +26,7 @@ PV_DIR := $(BUILDDIR)/$(PV)
# Prepare
# ----------------------------------------------------------------------------
-PV_MAKEVARS := $(CROSS_ENV_LD)
+PV_MAKE_OPT := $(CROSS_ENV_LD)
#
# autoconf
diff --git a/rules/wireless.make b/rules/wireless.make
index e98191ef3..24ae08b66 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -42,7 +42,7 @@ endif
# Compile
# ----------------------------------------------------------------------------
-WIRELESS_MAKEVARS := \
+WIRELESS_MAKE_OPT := \
$(CROSS_ENV_CC) \
PREFIX=/usr
--
2.32.0
next reply other threads:[~2022-10-18 9:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 9:47 Ladislav Michl [this message]
2022-10-21 7:18 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y052RiUsQnsOBet1@lenoch \
--to=oss-lists@triops.cz \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox