CVS commit: pkgsrc/www/firefox

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun May 17 11:20:57 UTC 2020

Modified Files:
        pkgsrc/www/firefox: mozilla-common.mk

Log Message:
firefox: mend build failure on NetBSD 8

Build with clang, but with pkgsrc libstdc++ instead of from base.
This is needed because base doesn't have the necessary C++17 STL headers.
We don't really have any infrastructure to manage this properly so
kludge it manually into the package.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 pkgsrc/www/firefox/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.167 pkgsrc/www/firefox/mozilla-common.mk:1.168
--- pkgsrc/www/firefox/mozilla-common.mk:1.167  Fri May 15 06:59:25 2020
+++ pkgsrc/www/firefox/mozilla-common.mk        Sun May 17 11:20:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.167 2020/05/15 06:59:25 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.168 2020/05/17 11:20:57 tnn Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -248,6 +248,19 @@ PKG_CC=            ${PREFIX}/bin/clang
 PKG_CXX=       ${PREFIX}/bin/clang++
 BUILDLINK_DEPMETHOD.clang=     build
 .include "../../lang/clang/buildlink3.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-8.*-*)
+BUILDLINK_DEPMETHOD.gcc8=      full
+.include "../../lang/gcc8/buildlink3.mk"
+CWRAPPERS_PREPEND.cxx+= \
+       -L${BUILDLINK_PREFIX.gcc8}/gcc8/lib \
+       ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gcc8}/gcc8/lib \
+       -stdlib++-isystem \
+       ${BUILDLINK_PREFIX.gcc8}/gcc8/include/c++ \
+       -stdlib++-isystem \
+       ${BUILDLINK_PREFIX.gcc8}/gcc8/include/c++/${MACHINE_GNU_PLATFORM} \
+       -stdlib++-isystem \
+       ${BUILDLINK_PREFIX.gcc8}/gcc8/include/c++/backward
+.endif
 BUILDLINK_DEPMETHOD.rust=      build
 BUILDLINK_API_DEPENDS.rust+=   rust>=1.41.0
 .include "../../lang/rust/buildlink3.mk"