CVS commit: pkgsrc/audio/ocp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 18 20:38:37 UTC 2021

Modified Files:
        pkgsrc/audio/ocp: distinfo
        pkgsrc/audio/ocp/patches: patch-configure

Log Message:
ocp: completely remove gcc version check

This broke again with gcc 10.
Trust pkgsrc to provide a working compiler.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/ocp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/ocp/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/audio/ocp/distinfo
diff -u pkgsrc/audio/ocp/distinfo:1.11 pkgsrc/audio/ocp/distinfo:1.12
--- pkgsrc/audio/ocp/distinfo:1.11      Thu Jul 26 14:11:36 2018
+++ pkgsrc/audio/ocp/distinfo   Sun Apr 18 20:38:37 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2018/07/26 14:11:36 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2021/04/18 20:38:37 wiz Exp $
 
 SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380
 RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5b
 SHA1 (patch-ad) = 5252050662343fa2575d84e883f8d157b4a2de0e
 SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
 SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9
-SHA1 (patch-configure) = 823ace11818bc5289636324cdcc3ca09496a690f
+SHA1 (patch-configure) = c26f3be5c102da245f0e0c55d17a34cfdb844a37
 SHA1 (patch-goodies_helpc_Makefile.in) = aeb8f25afa126aa0db50325d2d7daf0eccedaee3
 SHA1 (patch-playay_ayplay.c) = 565efad3e619743fd7260c2957152a0b116674c4
 SHA1 (patch-playym_ympplay.cpp) = d0d5fd0126e30f5036f0267d17ae3524c9afcb34

Index: pkgsrc/audio/ocp/patches/patch-configure
diff -u pkgsrc/audio/ocp/patches/patch-configure:1.2 pkgsrc/audio/ocp/patches/patch-configure:1.3
--- pkgsrc/audio/ocp/patches/patch-configure:1.2        Fri Feb 16 12:47:55 2018
+++ pkgsrc/audio/ocp/patches/patch-configure    Sun Apr 18 20:38:37 2021
@@ -1,15 +1,40 @@
-$NetBSD: patch-configure,v 1.2 2018/02/16 12:47:55 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2021/04/18 20:38:37 wiz Exp $
 
-Allow gcc-5.x and newer.
+Remove gcc check, trust pkgsrc to provide a working one.
 
 --- configure.orig     2011-11-17 21:46:08.000000000 +0000
 +++ configure
-@@ -4589,7 +4589,7 @@ else
-               '')
-                       as_fn_error $? "not found" "$LINENO" 5;
-                       ;;
+@@ -4579,33 +4579,6 @@ test "x$exec_prefix" = xNONE && exec_pre
+ 
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
+-$as_echo_n "checking gcc version... " >&6; }
+-cc_version=`( $CC -dumpversion ) 2>&1`
+-if test "$?" -gt 0 || test x$cc_version = x; then
+-      as_fn_error $? "not found" "$LINENO" 5
+-else
+-      case $cc_version in
+-              '')
+-                      as_fn_error $? "not found" "$LINENO" 5;
+-                      ;;
 -              2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*)
-+              2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|[4-9].*)
-                       _cc_major=`echo $cc_version | cut -d '.' -f 1`
-                       _cc_minor=`echo $cc_version | cut -d '.' -f 2`
-                       _cc_mini=`echo $cc_version | cut -d '.' -f 3`
+-                      _cc_major=`echo $cc_version | cut -d '.' -f 1`
+-                      _cc_minor=`echo $cc_version | cut -d '.' -f 2`
+-                      _cc_mini=`echo $cc_version | cut -d '.' -f 3`
+-                      if test $_cc_major -gt 2; then
+-                              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_version, ok" >&5
+-$as_echo "$cc_version, ok" >&6; }
+-                      else
+-                              as_fn_error $? "$cc_version, bad" "$LINENO" 5
+-                      fi
+-                      ;;
+-              *)
+-                      as_fn_error $? "$cc_version, bad" "$LINENO" 5
+-                      ;;
+-       esac
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken signed char to signed int in loops (gcc version 4.1.1)" >&5
+ $as_echo_n "checking for broken signed char to signed int in loops (gcc version 4.1.1)... " >&6; }
+ if test "$cross_compiling" = yes; then :