dev-libs/hyperscan: Fix build for gcc9.x

Closes: https://bugs.gentoo.org/685618
Closes: https://bugs.gentoo.org/691384
Closes: https://bugs.gentoo.org/696856
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
index 100dba02f5a44a1faa93459423edb798623d4b06..7a0a28063f9fa11d61bbe3250003b3fe6cac02e7 100644 (file)
--- a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1
+inherit cmake-utils python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
 SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -24,6 +24,12 @@ DEPEND="${RDEPEND}"
 
 REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
 
+src_prepare() {
+       # upstream workaround
+       append-cxxflags -Wno-redundant-move
+       cmake-utils_src_prepare
+}
+
 src_configure() {
        local mycmakeargs=(
                -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)

diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
index 100dba02f5a44a1faa93459423edb798623d4b06..7a0a28063f9fa11d61bbe3250003b3fe6cac02e7 100644 (file)
--- a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1
+inherit cmake-utils python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
 SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -24,6 +24,12 @@ DEPEND="${RDEPEND}"
 
 REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
 
+src_prepare() {
+       # upstream workaround
+       append-cxxflags -Wno-redundant-move
+       cmake-utils_src_prepare
+}
+
 src_configure() {
        local mycmakeargs=(
                -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)