From 294e945309e5cabfbb60c80f95063e3be9b46bc2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 8 Nov 2020 20:10:23 -0800
Subject: traceroute: Fix build with LTO

Drop patch needed to build when S = B, we do not use this setting
anymore

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../filter-out-the-patches-from-subdirs.patch      | 47 ----------------------
 .../recipes-support/traceroute/traceroute_2.1.0.bb |  5 +--
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch

diff --git a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
deleted file mode 100644
index 2c030b55dd..0000000000
--- a/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e273e0ebc753645555909bcc4874c72458b17891 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Fri, 17 Jan 2014 03:17:44 -0500
-Subject: [PATCH] Make.rules: filter-out the patches from subdirs
-
-The $(subdirs) contains all the dirs under the ${B}, and this one:
-
-do_unpack[cleandirs] = "${S}/patches"
-
-will create a "patches" dir, then there will be compile errors, filter
-out the patches will fix the problem.
-
-Note: poky doesn't have this problem since it separates the ${S} and
-${B}
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- Make.rules |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Make.rules b/Make.rules
-index b077cd5..0bfce2d 100644
---- a/Make.rules
-+++ b/Make.rules
-@@ -97,7 +97,7 @@ endif
- subdirs := $(filter-out $(SKIPDIRS), $(subdirs))
- endif
- 
--install install-%: subdirs := $(filter-out $(SKIPINSTALL), $(subdirs))
-+install install-%: subdirs := $(filter-out $(SKIPINSTALL) patches, $(subdirs))
- 
- 
- override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
-@@ -106,7 +106,7 @@ override MAKE += srcdir=$(srcdir) subdirs="$(subdirs)" shared=$(shared)
- INCLUDEDIRS := $(filter $(INCLUDEDIRS), $(subdirs))
- LIBDIRS := $(filter $(LIBDIRS), $(subdirs))
- MODDIRS := $(filter $(MODDIRS), $(subdirs))
--EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS), $(subdirs))
-+EXEDIRS := $(filter-out $(INCLUDEDIRS) $(LIBDIRS) $(MODDIRS) patches, $(subdirs))
- MODUSERS := $(filter $(MODUSERS), $(subdirs))
- SBINUSERS := $(filter $(SBINUSERS), $(subdirs))
- 
--- 
-1.7.10.4
-
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
index 19bbf03f1d..18930b14aa 100644
--- a/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
+++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
@@ -16,16 +16,13 @@ inherit update-alternatives
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/traceroute/"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \
-           file://filter-out-the-patches-from-subdirs.patch \
 "
-
 SRC_URI[md5sum] = "84d329d67abc3fb83fc8cb12aeaddaba"
 SRC_URI[sha256sum] = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"
 
-EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}"
+LTOEXTRA += "-flto-partition=none"
 
 do_compile() {
-    export LDFLAGS="${TARGET_LDFLAGS} -L${S}/libsupp"
     oe_runmake "env=yes"
 }
 
-- 
cgit 1.2.3-korg