From 1520b4a13f779cf841a1f5f2aa0cefa5b51aa8ffa49a08f792c23f01d38db742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aeneas=20Jai=C3=9Fle?= Date: Fri, 26 Dec 2014 21:13:03 +0000 Subject: [PATCH] Accepting request 266447 from home:AndreasSchwab:f - Apply profiling patch whenever %optflags includes -fomit-frame-pointer OBS-URL: https://build.opensuse.org/request/show/266447 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iperf?expand=0&rev=22 --- iperf.changes | 5 +++++ iperf.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/iperf.changes b/iperf.changes index 62cc62d..8a947ad 100644 --- a/iperf.changes +++ b/iperf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 26 16:14:38 UTC 2014 - schwab@linux-m68k.org + +- Apply profiling patch whenever %optflags includes -fomit-frame-pointer + ------------------------------------------------------------------- Thu Jul 17 20:12:49 UTC 2014 - msvec@suse.com diff --git a/iperf.spec b/iperf.spec index d214072..a095788 100644 --- a/iperf.spec +++ b/iperf.spec @@ -25,7 +25,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Url: http://software.es.net/iperf/ Source: http://downloads.es.net/pub/iperf/%{name}-%{version}.tar.gz -# PATCH-FIX-OPENSUSE -- Disable profiling on i586, as option -pg conflicts with -fomit-frame-pointer +# PATCH-FIX-OPENSUSE -- Disable profiling if %optflags includes -fomit-frame-pointer, as option -pg conflicts with it Patch1: iperf-3.0.5_disable-profiling.patch %if %{?sles_version} && %{?sles_version} <= 11 BuildRequires: libuuid-devel @@ -80,7 +80,7 @@ This package contains development files. %prep %setup -q -%ifarch i386 i486 i586 i686 +%if 0%(case "%optflags" in (*-fomit-frame-pointer*) echo 1;; esac) %patch1 -p 1 %endif