kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tweak clang compiler version matching

Browse source
This commit is contained in:
dbj 2017-11-03 07:49:58 +00:00
parent 207bcf84b9
commit 22b3c61ffb
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emulators/stella/distinfo
View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.21 2017/09/14 06:04:07 dholland Exp $ $NetBSD: distinfo,v 1.22 2017/11/03 07:49:58 dbj Exp $
SHA1 (stella-4.7.3.tar.gz) = 7f4a4f8c88b335aee35bd2a87f3f4e109d7cb190 SHA1 (stella-4.7.3.tar.gz) = 7f4a4f8c88b335aee35bd2a87f3f4e109d7cb190
RMD160 (stella-4.7.3.tar.gz) = 188ccb822f8e3eb6b231ff0d4460fd6d9bf44ccc RMD160 (stella-4.7.3.tar.gz) = 188ccb822f8e3eb6b231ff0d4460fd6d9bf44ccc
SHA512 (stella-4.7.3.tar.gz) = 76028f3e4a8a7d49e2444d1d3c348060df4dfa54a7675521c3197235084f3eb44550e0df5a6b57c71c404a87d648f9a7798bb850faec7a17499b97ca4fd52bb5 SHA512 (stella-4.7.3.tar.gz) = 76028f3e4a8a7d49e2444d1d3c348060df4dfa54a7675521c3197235084f3eb44550e0df5a6b57c71c404a87d648f9a7798bb850faec7a17499b97ca4fd52bb5
Size (stella-4.7.3.tar.gz) = 2270157 bytes Size (stella-4.7.3.tar.gz) = 2270157 bytes
SHA1 (patch-configure) = 7a18472b08290c043ad9e300b907ae305184641a SHA1 (patch-configure) = 4a86af5c1baea0989e77eb621d7e632400c4f9e5
SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3 SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3

13
emulators/stella/patches/patch-configure
View file

@ -1,16 +1,23 @@
$NetBSD: patch-configure,v 1.3 2017/09/14 06:04:07 dholland Exp $ $NetBSD: patch-configure,v 1.4 2017/11/03 07:49:58 dbj Exp $
Recognize more clang versions. Recognize more clang versions.
Recognize solaris, dragonfly, bitrig, and darwin. Recognize solaris, dragonfly, bitrig, and darwin.
--- configure.orig 2016-11-21 19:22:17.000000000 +0000 --- configure.orig 2016-11-21 19:22:17.000000000 +0000
+++ configure +++ 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 fi
case $cxx_version in 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].[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_major=`echo $cxx_version | cut -d '.' -f 1`
_cxx_minor=`echo $cxx_version | cut -d '.' -f 2` _cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
cxx_version="$cxx_version, ok" cxx_version="$cxx_version, ok"