diff options
| author | dbj <dbj@pkgsrc.org> | 2019-09-08 20:04:54 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2019-09-08 20:04:54 +0000 |
| commit | 4815a6ecdbe8f8542bbf0ad7f785992a1c31f986 (patch) | |
| tree | 62d5fbdf5a97fc0c889c359514065553964b7337 /emulators | |
| parent | 45282d9d1bfbde2f800af660373595ed8c889ee5 (diff) | |
| download | pkgsrc-4815a6ecdbe8f8542bbf0ad7f785992a1c31f986.tar.gz | |
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.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/stella/distinfo | 3 | ||||
| -rw-r--r-- | emulators/stella/patches/patch-configure | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo index 3f4efba331d..c79fa2d08ff 100644 --- a/emulators/stella/distinfo +++ b/emulators/stella/distinfo @@ -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 diff --git a/emulators/stella/patches/patch-configure b/emulators/stella/patches/patch-configure new file mode 100644 index 00000000000..c40851315de --- /dev/null +++ b/emulators/stella/patches/patch-configure @@ -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" + |