From 23b0bb480b666005c5b1a3b14c7745388b298a52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Aug 2017 16:59:52 +0200
Subject: [PATCH] gcc: override glibcxx_cv_c99_math_cxx98=yes and
 glibcxx_cv_c99_math_cxx11=yes.

A glibc 2.26 regression (https://sourceware.org/bugzilla/show_bug.cgi?id=21930)
broke the test detecting whether libstdc++ can make use of C99 <math.h>
functions, which resulted in <cmath> loading <math.h> the wrong way,
breaking all C++ code using <cmath>.

We override the test to provide the correct result, and <math.h> is now
imported again in a C++ friendly way via <cmath>.

Closes #7324.
See also #7307.
---
 srcpkgs/gcc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 05ea9bed2f9..1e926d51c65 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@ _gcjrel=17
 
 pkgname=gcc
 version=${_majorver}.0
-revision=4
+revision=5
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
@@ -159,6 +159,7 @@ do_configure() {
 
 	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
 	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
+	export glibcxx_cv_c99_math_cxx98=yes glibcxx_cv_c99_math_cxx11=yes
 
 	_args+=" --prefix=/usr"
 	_args+=" --mandir=/usr/share/man"
@@ -190,6 +191,7 @@ do_configure() {
 	CONFIG_SHELL=/bin/bash ${wrksrc}/configure ${_args}
 }
 do_build() {
+	export glibcxx_cv_c99_math_cxx98=yes glibcxx_cv_c99_math_cxx11=yes
 	if [ -z "$CHROOT_READY" ]; then
 		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
 	fi