moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

gcc: override glibcxx_cv_c99_math_cxx98=yes and glibcxx_cv_c99_math_cxx11=yes.

Browse source 
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.
This commit is contained in:
Leah Neukirchen 2017-08-10 16:59:52 +02:00
parent 1b3248fb51
commit 23b0bb480b
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/gcc/template
View file

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