aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2017-11-14 13:53:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:14:33 +0000
commitb3fda1e35c399060838620d2c96c22cdbbd95c96 (patch)
treea23235eccd0e6d945e38650d492b8030418f53e3
parent49b2d571da88fb2afce71835276523ed3538d31f (diff)
downloadopenembedded-core-b3fda1e35c399060838620d2c96c22cdbbd95c96.zip
openembedded-core-b3fda1e35c399060838620d2c96c22cdbbd95c96.tar.gz
openembedded-core-b3fda1e35c399060838620d2c96c22cdbbd95c96.tar.bz2
net-tools: correctly set COPTS and LOPTS
COPTS will be ignored if it is defined in the environment. It must be passed directly to make. To be consistent, we pass LOPTS that way, too. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit dede6d3d37aab72ae897c3709d21108fa75f6673) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb14
1 files changed, 3 insertions, 11 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index c23d533..69c9af3 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -81,20 +81,12 @@ do_configure() {
do_compile() {
# net-tools use COPTS/LOPTS to allow adding custom options
- export COPTS="$CFLAGS"
- export LOPTS="$LDFLAGS"
- unset CFLAGS
- unset LDFLAGS
-
- oe_runmake
+ oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS"
}
do_install() {
- export COPTS="$CFLAGS"
- export LOPTS="$LDFLAGS"
- unset CFLAGS
- unset LDFLAGS
- oe_runmake 'BASEDIR=${D}' install
+ # We don't need COPTS or LOPTS, but let's be consistent.
+ oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" 'BASEDIR=${D}' install
if [ "${base_bindir}" != "/bin" ]; then
mkdir -p ${D}/${base_bindir}