From 4ea581785bda37bc01a20fbf5095c087e3bcda26 Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Tue, 22 Nov 2016 01:36:50 +0300 Subject: [PATCH] dev-util/oprofile: fix bug 600000 Remove -ftemplate-depth-50 limitation from configure: this is not sufficient depth with gcc-6.2, see bug 600000 for details. Package-Manager: portage-2.3.2 Signed-off-by: Andrew Savchenko --- .../files/oprofile-1.1.0-gcc6-template-depth.patch | 10 ++++++++++ dev-util/oprofile/oprofile-1.1.0-r1.ebuild | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch new file mode 100644 index 000000000000..01fc86910a3a --- /dev/null +++ b/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch @@ -0,0 +1,10 @@ +--- oprofile-1.1.0/configure.ac.orig 2015-07-21 17:53:27.000000000 +0300 ++++ oprofile-1.1.0/configure.ac 2016-11-22 01:15:31.329067697 +0300 +@@ -320,7 +320,6 @@ + AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-Wall]) + AX_CFLAGS_OPTION(OP_CFLAGS,[-fno-common]) + AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-fno-common]) +-AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-ftemplate-depth-50]) + AX_CFLAGS_OPTION(OP_CFLAGS,[-Wdeclaration-after-statement]) + + dnl enable option to use GCC test coverage diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild index 6e83c7c0cddf..57474e727c1a 100644 --- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild +++ b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI="5" -inherit eutils java-pkg-opt-2 linux-info multilib user +inherit autotools eutils java-pkg-opt-2 linux-info multilib user MY_P=${PN}-${PV/_/-} DESCRIPTION="A transparent low-overhead system-wide profiler" @@ -46,6 +46,9 @@ pkg_setup() { src_prepare() { # fix bug #594178 epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch" + # bug #600000 + epatch "${FILESDIR}/${PN}-1.1.0-gcc6-template-depth.patch" + eautoreconf } src_configure() { -- 2.26.2