$OpenBSD: patch-configure,v 1.8 2019/01/14 15:46:55 pascal Exp $
Index: configure
--- configure.orig
+++ configure
@@ -4981,7 +4981,7 @@ fi
 
 done
 
-for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
+for ac_header in soundcard.h linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -16611,7 +16611,7 @@ return ID3Tag_Link ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' "id3 -lz -lstdc++"; do
+for ac_lib in '' "id3 -lz"; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -16646,10 +16646,10 @@ $as_echo "#define HAVE_ID3V2 /**/" >>confdefs.h
 
 		if test "$enable_shared_id3" = "yes"; then
 		  echo "using shared id3lib"
-		  ID3_LIBS="-lid3 -lz -lstdc++"
+		  ID3_LIBS="-lid3 -lz"
 	        else
 		  echo "using static id3lib"
-		  ID3_LIBS="$prefix/lib/libid3.a -lz -lstdc++"
+		  ID3_LIBS="$prefix/lib/libid3.a -lz"
 	    fi
 else
   id3lib=no
