From b55991445032636c59c63aab64642dab4957a2af Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 Mar 2020 09:28:00 +0000 Subject: [PATCH] dev-vcs/mercurial: drop 'strip-flags' parameters, bug #712594 This is not a fix for bug #712594. The code change only gets ebuild to the state it was before f8669c1089dd9962d946c7be46 "flag-o-matic.eclass: add assertions around argument counts" was submitted. We'll need a proper fix. I've left a TODO in ebuild. Bug: https://bugs.gentoo.org/712594 Package-Manager: Portage-2.3.94, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich --- dev-vcs/mercurial/mercurial-4.6.2.ebuild | 2 +- dev-vcs/mercurial/mercurial-4.9-r2.ebuild | 2 +- dev-vcs/mercurial/mercurial-4.9.1.ebuild | 4 ++-- dev-vcs/mercurial/mercurial-5.0.2.ebuild | 4 ++-- dev-vcs/mercurial/mercurial-5.1.2.ebuild | 2 +- dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild | 2 +- dev-vcs/mercurial/mercurial-9999.ebuild | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild index eb2b0fe3fdcd..135710a8f27a 100644 --- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild @@ -41,7 +41,7 @@ python_prepare_all() { } python_configure_all() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 # Note: make it impl-conditional if py3 is supported append-flags -fno-strict-aliasing diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild index 2bb6186ecadb..25fa556dc7ae 100644 --- a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild +++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild @@ -49,7 +49,7 @@ python_prepare_all() { } python_configure_all() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 # Note: make it impl-conditional if py3 is supported append-flags -fno-strict-aliasing diff --git a/dev-vcs/mercurial/mercurial-4.9.1.ebuild b/dev-vcs/mercurial/mercurial-4.9.1.ebuild index 6d3bef63979d..c50921ab4f38 100644 --- a/dev-vcs/mercurial/mercurial-4.9.1.ebuild +++ b/dev-vcs/mercurial/mercurial-4.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -49,7 +49,7 @@ python_prepare_all() { } python_configure_all() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 # Note: make it impl-conditional if py3 is supported append-flags -fno-strict-aliasing diff --git a/dev-vcs/mercurial/mercurial-5.0.2.ebuild b/dev-vcs/mercurial/mercurial-5.0.2.ebuild index c3f5137de8f6..8e116e668203 100644 --- a/dev-vcs/mercurial/mercurial-5.0.2.ebuild +++ b/dev-vcs/mercurial/mercurial-5.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -49,7 +49,7 @@ python_prepare_all() { } python_configure_all() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 # Note: make it impl-conditional if py3 is supported append-flags -fno-strict-aliasing diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.1.2.ebuild index 7ae34dee8a9e..24db3c875e13 100644 --- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild +++ b/dev-vcs/mercurial/mercurial-5.1.2.ebuild @@ -49,7 +49,7 @@ python_prepare_all() { } python_configure_all() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 # Note: make it impl-conditional if py3 is supported append-flags -fno-strict-aliasing diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild index 474c441d6778..051a9978464b 100644 --- a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild @@ -55,7 +55,7 @@ python_prepare_all() { } python_compile() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" distutils-r1_python_compile build_ext --no-zstd } diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 8c12d545eb87..8a93eddd65bf 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -57,7 +57,7 @@ python_prepare_all() { } python_compile() { - strip-flags -ftracer -ftree-vectorize + strip-flags # was '-ftracer -ftree-vectorize', TODO: see bug #712594 python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" distutils-r1_python_compile build_ext --no-zstd } -- 2.26.2