commit: 5c0ee68d09f9f5845220c12d764b38cd352ad8ea Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Thu Oct 29 16:56:23 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu Oct 29 16:57:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c0ee68d
dev-libs/libpy-0.2.5-r1: Fix CFLAGS (bug #751658), typo (bug #751655) Closes: https://bugs.gentoo.org/751658 Closes: https://bugs.gentoo.org/751655 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-libs/libpy/files/libpy-0.2.5-cflags.patch | 24 ++++++++++++++++++++++ .../{libpy-0.2.5.ebuild => libpy-0.2.5-r1.ebuild} | 9 ++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dev-libs/libpy/files/libpy-0.2.5-cflags.patch b/dev-libs/libpy/files/libpy-0.2.5-cflags.patch new file mode 100644 index 00000000000..be8dd1f2172 --- /dev/null +++ b/dev-libs/libpy/files/libpy-0.2.5-cflags.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile b/Makefile +index 09e6e39..9addb5d 100644 +--- a/Makefile ++++ b/Makefile +@@ -46,9 +46,8 @@ CLANG_WARNINGS := \ + -Wno-self-assign-overloaded + WARNINGS := $(BASE_WARNINGS) $($(COMPILER)_WARNINGS) + +-BASE_CXXFLAGS = -std=gnu++17 -g -O$(OPTLEVEL) \ ++BASE_CXXFLAGS = -std=gnu++17 -g \ + -fwrapv -fno-strict-aliasing -pipe \ +- -march=x86-64 -mtune=generic \ + -fvisibility=hidden \ + $(WARNINGS) \ + -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) \ +@@ -58,7 +57,7 @@ BASE_CXXFLAGS = -std=gnu++17 -g -O$(OPTLEVEL) \ + -DLIBPY_MICRO_VERSION=$(MICRO_VERSION) + GCC_FLAGS = -fmax-errors=$(MAX_ERRORS) + CLANG_FLAGS = -ferror-limit=$(MAX_ERRORS) +-CXXFLAGS = $(BASE_CXXFLAGS) $($(COMPILER)_FLAGS) ++CXXFLAGS += $(BASE_CXXFLAGS) $($(COMPILER)_FLAGS) + + # https://github.com/quantopian/libpy/pull/86/files#r309288697 + INCLUDE_DIRS := include/ \ diff --git a/dev-libs/libpy/libpy-0.2.5.ebuild b/dev-libs/libpy/libpy-0.2.5-r1.ebuild similarity index 87% rename from dev-libs/libpy/libpy-0.2.5.ebuild rename to dev-libs/libpy/libpy-0.2.5-r1.ebuild index 567bbd05d59..a0d5be7d1dc 100644 --- a/dev-libs/libpy/libpy-0.2.5.ebuild +++ b/dev-libs/libpy/libpy-0.2.5-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit distutils-r1 +inherit flag-o-matic distutils-r1 GTEST_VER="23b2a3b1cf803999fb38175f6e9e038a4495c8a5" @@ -35,13 +35,18 @@ BDEPEND="${COMMON_DEPEND} " RESTRICT="!test? ( test )" -REQUIRES_USE="test? ( sparsehash )" +REQUIRED_USE="test? ( sparsehash )" PATCHES=( "${FILESDIR}/libpy-0.2.5-no-werror.patch" "${FILESDIR}/libpy-0.2.5-permissions.patch" + "${FILESDIR}/libpy-0.2.5-cflags.patch" ) python_test() { emake GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}" test || die "Tests failed with ${EPYTHON}" } + +python_configure() { + replace-flags '-O*' '-O3' +}
