Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jul 2023 03:30:00 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 970037212b02 - 2023Q3 - science/cantera: Fix build
Message-ID:  <202307090330.3693U0WD040275@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=970037212b02853813905066ab25516b5b9af741

commit 970037212b02853813905066ab25516b5b9af741
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-08 02:48:47 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-09 03:29:58 +0000

    science/cantera: Fix build
    
    It was broken because the project used the c++11 mode, but
    googletest now requires at least c++14, and they look for
    googletest in configure.
    
    Reported by:    fallout
    
    (cherry picked from commit 34a03406f8c47c702d48d68928da1e240314227e)
---
 science/cantera/files/patch-SConstruct | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/science/cantera/files/patch-SConstruct b/science/cantera/files/patch-SConstruct
index de5294d25f39..cbccdcef24f3 100644
--- a/science/cantera/files/patch-SConstruct
+++ b/science/cantera/files/patch-SConstruct
@@ -1,5 +1,16 @@
+- the first part is fixing the configure failure, see https://github.com/Cantera/cantera/issues/1536
+
 --- SConstruct.orig	2022-05-01 15:31:54 UTC
 +++ SConstruct
+@@ -191,7 +191,7 @@ config_options = [
+         {
+             "cl": "/EHsc",
+             "Cygwin": "-std=gnu++11", # See http://stackoverflow.com/questions/18784112
+-            "default": "-std=c++11"
++            "default": "-std=c++14"
+         }),
+     Option(
+         "CC",
 @@ -805,6 +805,9 @@ elif "icx" in env.subst("$CC"):
  elif "clang" in env.subst("$CC"):
      config.select("clang")



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307090330.3693U0WD040275>