Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox firefox: mend build failure on NetBSD 8



details:   https://anonhg.NetBSD.org/pkgsrc/rev/205dfb9b6cb3
branches:  trunk
changeset: 431894:205dfb9b6cb3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun May 17 11:20:57 2020 +0000

description:
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.

diffstat:

 www/firefox/mozilla-common.mk |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r dfab325a94ad -r 205dfb9b6cb3 www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Sun May 17 10:20:27 2020 +0000
+++ b/www/firefox/mozilla-common.mk     Sun May 17 11:20:57 2020 +0000
@@ -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_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"



Home | Main Index | Thread Index | Old Index