wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

firefox-esr: fix gcc6 build

Browse source 
Cherry picked patches from the openembedded mailing list:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-July/108029.html

Also see #4748
This commit is contained in:
Juergen Buchmueller 2016-09-17 15:21:27 +02:00
parent ff2687315c
commit 1c55f26a44
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/firefox-esr/patches/fix-gcc6-cpluplus_scope.patch Normal file
View file

@ -0,0 +1,15 @@
Add patch to to correct the source to be compatible with gcc6 by
preventing c++ scope errors.
--- nsprpub/config/make-system-wrappers.pl 2016-05-12 19:10:05.000000000 +0200
+++ nsprpub/config/make-system-wrappers.pl 2016-09-17 15:03:53.901400739 +0200
@@ -19,7 +19,9 @@
open OUT, ">$output_dir/$_";
print OUT "#pragma GCC system_header\n"; # suppress include_next warning
print OUT "#pragma GCC visibility push(default)\n";
+ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
print OUT "#include_next \<$_\>\n";
+ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
print OUT "#pragma GCC visibility pop\n";
close OUT;
}

13
srcpkgs/firefox-esr/template
View file

@ -1,7 +1,7 @@
# Template build file for 'firefox-esr'. # Template build file for 'firefox-esr'.
pkgname=firefox-esr pkgname=firefox-esr
version=45.3.0 version=45.3.0
revision=1 revision=2
wrksrc="firefox-${version}esr" wrksrc="firefox-${version}esr"
short_desc="Lightweight gecko-based web browser" short_desc="Lightweight gecko-based web browser"
maintainer="Eivind Uggedal <eivind@uggedal.com>" maintainer="Eivind Uggedal <eivind@uggedal.com>"
@ -27,6 +27,17 @@ makedepends="
depends="nss>=3.21 desktop-file-utils hicolor-icon-theme" depends="nss>=3.21 desktop-file-utils hicolor-icon-theme"
conflicts="firefox>=0" conflicts="firefox>=0"
CXXFLAGS="-std=c++11"
_gccver=$(gcc --version | awk '/^gcc \(GCC\)/ { print $3 }')
if [ "${_gccver%%.*}" -gt 5 ]; then
# Append CFLAGS and CXXFLAGS to set work around code which gcc6 would
# otherwise regard as out-of-specification and allow it to produce a
# working program.
CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
fi
pre_configure() { pre_configure() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) *-musl)