CVS commit: pkgsrc/emulators/stella

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sun Sep  8 20:04:55 UTC 2019

Modified Files:
        pkgsrc/emulators/stella: distinfo
Added Files:
        pkgsrc/emulators/stella/patches: patch-configure

Log Message:
emulators/stella: fix build with clang and pkgsrc cwrappers

pkgsrc cwrappers add -stdc=c++14 which causes an error
when using clang -x c, so instead use -x c++ which works.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/emulators/stella/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/emulators/stella/patches/patch-configure

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

Modified files:

Index: pkgsrc/emulators/stella/distinfo
diff -u pkgsrc/emulators/stella/distinfo:1.23 pkgsrc/emulators/stella/distinfo:1.24
--- pkgsrc/emulators/stella/distinfo:1.23       Mon Jun 17 13:51:08 2019
+++ pkgsrc/emulators/stella/distinfo    Sun Sep  8 20:04:54 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.23 2019/06/17 13:51:08 nia Exp $
+$NetBSD: distinfo,v 1.24 2019/09/08 20:04:54 dbj Exp $
 
 SHA1 (stella-6.0.1-src.tar.xz) = 36f87dd1d3d9b9c34f61c2209458838f172b6cac
 RMD160 (stella-6.0.1-src.tar.xz) = 3216429952178564e714548b2447b3e24b6c888d
 SHA512 (stella-6.0.1-src.tar.xz) = e62840acf39d558ff166292fa844b5a994ccaf5f697b2f8aeb21298e5d111b68a743fe43c053f20df1a7fe3b931ec49a875cc855207182d0f79f86683990ff72
 Size (stella-6.0.1-src.tar.xz) = 1730084 bytes
+SHA1 (patch-configure) = 4818245fe59c6c73e6d7647e7d3aed1f3c938c90

Added files:

Index: pkgsrc/emulators/stella/patches/patch-configure
diff -u /dev/null pkgsrc/emulators/stella/patches/patch-configure:1.6
--- /dev/null   Sun Sep  8 20:04:55 2019
+++ pkgsrc/emulators/stella/patches/patch-configure     Sun Sep  8 20:04:54 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.6 2019/09/08 20:04:54 dbj Exp $
+
+pkgsrc cwrappers add -stdc=c++14 which causes an error
+when using clang -x c, so instead use -x c++ which works.
+
+--- configure.orig     2019-06-02 16:25:55.000000000 +0000
++++ configure
+@@ -385,9 +385,9 @@ cc_check_define __GNUC__ && have_gcc=yes
+ 
+ if test "$have_clang" = yes; then
+ 
+-      clang_minor=$( $CXX -dM -E -x c /dev/null | grep __clang_minor__ | sed -E 's/.* ([0-9]+).*/\1/' )
+-      clang_patch=$( $CXX -dM -E -x c /dev/null | grep __clang_patchlevel__ | sed -E 's/.* ([0-9]+).*/\1/' )
+-      clang_major=$( $CXX -dM -E -x c /dev/null | grep __clang_major__ | sed -E 's/.* ([0-9]+).*/\1/' )
++      clang_minor=$( $CXX -dM -E -x c++ /dev/null | grep __clang_minor__ | sed -E 's/.* ([0-9]+).*/\1/' )
++      clang_patch=$( $CXX -dM -E -x c++ /dev/null | grep __clang_patchlevel__ | sed -E 's/.* ([0-9]+).*/\1/' )
++      clang_major=$( $CXX -dM -E -x c++ /dev/null | grep __clang_major__ | sed -E 's/.* ([0-9]+).*/\1/' )
+ 
+       cxx_version="$clang_major.$clang_minor.$clang_patch"
+