commit:     b33a038cbac1a238d184e8c387b2b6fc7a7d6150
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 05:12:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 05:17:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33a038c

sci-mathematics/octave: disable GLIBCXX_ASSERTIONS (libstdc++ bug)

It's not a test-only issue so could cause SIGABRT at runtime, so
revbump.

The libstdc++ issue is reported upstream at
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107538.

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

 .../octave/{octave-6.4.0-r4.ebuild => octave-6.4.0-r5.ebuild}      | 5 ++++-
 .../octave/{octave-7.3.0-r1.ebuild => octave-7.3.0-r2.ebuild}      | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r4.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
similarity index 98%
rename from sci-mathematics/octave/octave-6.4.0-r4.ebuild
rename to sci-mathematics/octave/octave-6.4.0-r5.ebuild
index 4bc8ceb0934f..b3eb587fad29 100644
--- a/sci-mathematics/octave/octave-6.4.0-r4.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -119,6 +119,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # libstdc++ bug, bug #887815
+       append-cxxflags -U_GLIBCXX_ASSERTIONS
+
        # unfortunate dependency on mpi from hdf5 (bug #302621)
        use hdf5 && has_version sci-libs/hdf5[mpi] && \
                export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
similarity index 96%
rename from sci-mathematics/octave/octave-7.3.0-r1.ebuild
rename to sci-mathematics/octave/octave-7.3.0-r2.ebuild
index 50d77f9706b7..2d09264e6440 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
 
 DESCRIPTION="High-level interactive language for numerical computations"
 HOMEPAGE="https://www.gnu.org/software/octave/";
@@ -144,6 +144,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # libstdc++ bug, bug #887815
+       append-cxxflags -U_GLIBCXX_ASSERTIONS
+
        # Unfortunate dependency on mpi from hdf5 (bug #302621)
        use hdf5 && has_version sci-libs/hdf5[mpi] && \
                export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77

Reply via email to