diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2017-11-12 11:50:21 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2017-11-12 11:50:21 +0000 |
| commit | 7656ec20ac536191d0bab5c20d64ae4930b0bf4b (patch) | |
| tree | bb67bdbb6ff5b46f71d5de515306cfa80652c2f7 | |
| parent | bfed442f5a34b5cffa822ab05e33e81db81c3666 (diff) | |
| download | pkgsrc-7656ec20ac536191d0bab5c20d64ae4930b0bf4b.tar.gz | |
Pullup ticket #5634 - requested by sevan
emulators/stella: build fix
Revisions pulled up:
- emulators/stella/distinfo 1.22
- emulators/stella/patches/patch-configure 1.4
---
Module Name: pkgsrc
Committed By: dbj
Date: Fri Nov 3 07:49:58 UTC 2017
Modified Files:
pkgsrc/emulators/stella: distinfo
pkgsrc/emulators/stella/patches: patch-configure
Log Message:
tweak clang compiler version matching
| -rw-r--r-- | emulators/stella/distinfo | 4 | ||||
| -rw-r--r-- | emulators/stella/patches/patch-configure | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo index a61029eac04..4f46c91c7db 100644 --- a/emulators/stella/distinfo +++ b/emulators/stella/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.21 2017/09/14 06:04:07 dholland Exp $ +$NetBSD: distinfo,v 1.21.4.1 2017/11/12 11:50:21 bsiegert Exp $ SHA1 (stella-4.7.3.tar.gz) = 7f4a4f8c88b335aee35bd2a87f3f4e109d7cb190 RMD160 (stella-4.7.3.tar.gz) = 188ccb822f8e3eb6b231ff0d4460fd6d9bf44ccc SHA512 (stella-4.7.3.tar.gz) = 76028f3e4a8a7d49e2444d1d3c348060df4dfa54a7675521c3197235084f3eb44550e0df5a6b57c71c404a87d648f9a7798bb850faec7a17499b97ca4fd52bb5 Size (stella-4.7.3.tar.gz) = 2270157 bytes -SHA1 (patch-configure) = 7a18472b08290c043ad9e300b907ae305184641a +SHA1 (patch-configure) = 4a86af5c1baea0989e77eb621d7e632400c4f9e5 SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3 diff --git a/emulators/stella/patches/patch-configure b/emulators/stella/patches/patch-configure index 59a9731df3d..2da0ca605b9 100644 --- a/emulators/stella/patches/patch-configure +++ b/emulators/stella/patches/patch-configure @@ -1,16 +1,23 @@ -$NetBSD: patch-configure,v 1.3 2017/09/14 06:04:07 dholland Exp $ +$NetBSD: patch-configure,v 1.3.4.1 2017/11/12 11:50:21 bsiegert Exp $ Recognize more clang versions. Recognize solaris, dragonfly, bitrig, and darwin. --- configure.orig 2016-11-21 19:22:17.000000000 +0000 +++ configure -@@ -392,7 +392,7 @@ if test "$have_clang" = yes; then +@@ -386,13 +386,13 @@ cc_check_define __GNUC__ && have_gcc=yes + + if test "$have_clang" = yes; then + cxx_name=`( $cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1` +- cxx_version=$( $CXX -dM -E -x c /dev/null | grep __clang_version__ | sed 's/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/g' 2>&1) ++ cxx_version=$( $CXX -dM -E -x c /dev/null | grep __clang_version__ | sed 's/^[^0-9]*\([0-9.]*\).*$/\1/g' 2>&1 ) + if test "$?" -gt 0; then + cxx_version="not found" fi case $cxx_version in - [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9]) -+ [3].[4-9]|[3].[4-9].[0-9]|[3-6].[4-9].[0-9][-.]*|[456].[0-9].[0-9]) ++ [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4-9].[0-9]*) _cxx_major=`echo $cxx_version | cut -d '.' -f 1` _cxx_minor=`echo $cxx_version | cut -d '.' -f 2` cxx_version="$cxx_version, ok" |