diff options
| author | dholland <dholland@pkgsrc.org> | 2015-10-05 06:33:46 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-10-05 06:33:46 +0000 |
| commit | 67d9cf45386b3752d08826de60fea8376b6f4cf3 (patch) | |
| tree | b325354c4f1af8a63196a939d369ddea60a283ca | |
| parent | 6baf0ac82f5e3b64d86fe92b378596497311c669 (diff) | |
| download | pkgsrc-67d9cf45386b3752d08826de60fea8376b6f4cf3.tar.gz | |
Fix netbsd build by improving the gcc version extraction "logic".
| -rw-r--r-- | lang/nhc98/distinfo | 3 | ||||
| -rw-r--r-- | lang/nhc98/patches/patch-script_confhc | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lang/nhc98/distinfo b/lang/nhc98/distinfo index 883f4ed2105..0d90834d969 100644 --- a/lang/nhc98/distinfo +++ b/lang/nhc98/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2013/10/25 06:25:18 dholland Exp $ +$NetBSD: distinfo,v 1.19 2015/10/05 06:33:46 dholland Exp $ SHA1 (nhc98src-1.22.tar.gz) = a8adc8f22371998ee0657bc0e01058a57d876abc RMD160 (nhc98src-1.22.tar.gz) = 99a90d00f77f66938c817c813f11c3d0ea5bf244 @@ -6,3 +6,4 @@ Size (nhc98src-1.22.tar.gz) = 29854160 bytes SHA1 (patch-Makefile.inc) = 4b457e962497595f3201c34220be02f2d6bf867e SHA1 (patch-aa) = 56c813285e90db7d0e4a6847b3806fcfc6e7d887 SHA1 (patch-ab) = 07e9456007d38fcca7db92064b4d18a7ae8a60f9 +SHA1 (patch-script_confhc) = 5876dee6fdbb29371e23f9244eecfa8623cb143a diff --git a/lang/nhc98/patches/patch-script_confhc b/lang/nhc98/patches/patch-script_confhc new file mode 100644 index 00000000000..7faa5142f2f --- /dev/null +++ b/lang/nhc98/patches/patch-script_confhc @@ -0,0 +1,16 @@ +$NetBSD: patch-script_confhc,v 1.1 2015/10/05 06:33:46 dholland Exp $ + +Fix gcc version detection so it doesn't object to what NetBSD gcc +prints, which is: "gcc (nb1 20140527) 4.8.3". + +--- script/confhc~ 2008-10-28 12:00:56.000000000 +0000 ++++ script/confhc +@@ -53,7 +53,7 @@ esac + # Report gcc version number + echo " Found C compiler: "`which $CCC` + echo " C compiler version: "`$CCC --version | head -n 1` +-GCCVERSION=`$CCC --version | head -n 1 | cut -d' ' -f 3` ++GCCVERSION=`$CCC --version | head -n 1 | awk '{ print $NF }'` + + # Ok, so first look for HBC + echo -n " Looking for hbc... " |