Sun Dec 22 22:21:58 2019 UTC ()
When using -dM -E to detect the C++ compiler, force C++ mode. Otherwise
-std=c++11 will break with clang.
(joerg)
diff -r1.6 -r1.7 pkgsrc/benchmarks/glmark2/distinfo
diff -r0 -r1.1 pkgsrc/benchmarks/glmark2/patches/patch-waflib_Tools_c__config.py
--- pkgsrc/benchmarks/glmark2/distinfo 2018/06/02 13:16:42 1.6
+++ pkgsrc/benchmarks/glmark2/distinfo 2019/12/22 22:21:58 1.7
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.6 2018/06/02 13:16:42 prlw1 Exp $ | | 1 | $NetBSD: distinfo,v 1.7 2019/12/22 22:21:58 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 5a27940b9e4ae2a1bc025079802e116af127479a | | 3 | SHA1 (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 5a27940b9e4ae2a1bc025079802e116af127479a |
| 4 | RMD160 (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 60572134a88fb3fd1a95f3be35d26b6c4edd852b | | 4 | RMD160 (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 60572134a88fb3fd1a95f3be35d26b6c4edd852b |
| 5 | SHA512 (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 9e2c8a2e2da5514476c3fe09e5d87380654b052b8488cfff2d7b06127bfcb92ca81eac09aea34d194ac4e0b9a0758696cc0ac0d4bc1117be5ed858a0ee22a3cc | | 5 | SHA512 (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 9e2c8a2e2da5514476c3fe09e5d87380654b052b8488cfff2d7b06127bfcb92ca81eac09aea34d194ac4e0b9a0758696cc0ac0d4bc1117be5ed858a0ee22a3cc |
| 6 | Size (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 7827207 bytes | | 6 | Size (glmark2-2017.07-168d2f1650c84be3f13d1a5b76ccec8cbb89188e.tar.gz) = 7827207 bytes |
| | | 7 | SHA1 (patch-waflib_Tools_c__config.py) = 8bb7716b211731cb8cfa8a73276e950fa363f710 |
$NetBSD: patch-waflib_Tools_c__config.py,v 1.1 2019/12/22 22:21:58 joerg Exp $
When detecting the C++ compiler, force C++ mode for stdin as the wrappers
add -std=c++11 and that breaks for C input.
--- waflib/Tools/c_config.py.orig 2019-12-21 22:11:24.000906920 +0000
+++ waflib/Tools/c_config.py
@@ -632,7 +632,7 @@ def cxx_load_tools(conf):
conf.load('cxx')
@conf
def get_cc_version(conf,cc,gcc=False,icc=False,clang=False):
- cmd=cc+['-dM','-E','-']
+ cmd=cc+(['-x','c++']if cc[0].endswith('+')else[])+['-dM','-E','-']
env=conf.env.env or None
try:
out,err=conf.cmd_and_log(cmd,output=0,input='\n'.encode(),env=env)