From b3fda1e35c399060838620d2c96c22cdbbd95c96 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Tue, 14 Nov 2017 13:53:28 -0800 Subject: 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 Signed-off-by: Ross Burton (cherry picked from commit dede6d3d37aab72ae897c3709d21108fa75f6673) Signed-off-by: Armin Kuster --- meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 14 +++----------- 1 file 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 c23d53376a..69c9af317d 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} -- cgit 1.2.3-korg