commit:     affa9e263c66472d917f46bc2129054e0d6fdcee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 21:10:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 21:11:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affa9e26

sci-libs/coinor-os: workaround build failure with GCC 11

Not backporting the patches given they're large and awkward
to rebase (they don't apply cleanly).

Closes: https://bugs.gentoo.org/808793
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/coinor-os/coinor-os-2.10.1.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild 
b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
index 2093e3961b6..792b443c5d9 100644
--- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
+++ b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ MY_PN=OS
 DESCRIPTION="COIN-OR Optimization Services"
 HOMEPAGE="https://projects.coin-or.org/OS/";
 SRC_URI="http://www.coin-or.org/download/source/${MY_PN}/${MY_PN}-${PV}.tgz";
+S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
 
 LICENSE="EPL-1.0"
 SLOT="0/6"
@@ -32,9 +33,9 @@ DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen[dot] )
        test? ( sci-libs/coinor-sample )"
 
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch"
+)
 
 src_prepare() {
        default
@@ -46,6 +47,11 @@ src_prepare() {
 src_configure() {
        append-cppflags -DNDEBUG
 
+       # Can be dropped > 2.10.3 as patches landed upstream but don't
+       # apply cleanly to 2.10.1.
+       # bug #808793
+       append-cxxflags -std=c++14
+
        econf \
                --enable-shared \
                $(use_enable static-libs static) \

Reply via email to