Re: pkg/53170: get_compiler patch, text only

[Keivan Motavalli <keivan%motavalli.me@localhost>]

The following reply was made to PR pkg/53170; it has been noted by GNATS.

From: Keivan Motavalli <keivan%motavalli.me@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/53170: get_compiler patch, text only
Date: Sat, 5 May 2018 16:54:01 +0200

 Index: =
 archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: =
 /cvsroot/pkgsrc/archivers/libarchive/files/libarchive/archive_openssl_hmac=
 _private.h,v
 retrieving revision 1.1.1.2
 diff -u -r1.1.1.2 archive_openssl_hmac_private.h
 --- archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h	=
 1 Aug 2017 22:21:17 -0000	1.1.1.2
 +++ archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h	=
 5 May 2018 14:37:30 -0000
 @@ -28,7 +28,7 @@
  #include <openssl/hmac.h>
  #include <openssl/opensslv.h>
 =20
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L || =
 defined(LIBRESSL_VERSION_NUMBER)
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || =
 (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < =
 0x2070000fL)
  #include <stdlib.h> /* malloc, free */
  #include <string.h> /* memset */
  static inline HMAC_CTX *HMAC_CTX_new(void)
 Index: bootstrap/bootstrap
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/pkgsrc/bootstrap/bootstrap,v
 retrieving revision 1.248
 diff -u -r1.248 bootstrap
 --- bootstrap/bootstrap	7 Mar 2018 07:34:07 -0000	1.248
 +++ bootstrap/bootstrap	5 May 2018 14:37:33 -0000
 @@ -131,40 +131,20 @@
  get_compiler()
  {
  	testcc=3D"${CC}"
 -	# normally, we'd just use 'cc', but certain configure tools look
 -	# for gcc specifically, so we have to see if that comes first
 -	if [ -z "${testcc}" ]; then
 -		save_IFS=3D"${IFS}"
 -		IFS=3D':'
 -		for dir in ${PATH}; do
 -			test -z "$dir" && dir=3D.
 -			if [ -x "$dir/gcc" ]; then
 -				testcc=3D"$dir/gcc"
 -				break
 -			fi
 -		done
 -		IFS=3D"${save_IFS}"
 -	fi
 -
  	# Clang compiler pretends to be GCC, so we have to check that
  	cat >${wrkdir}/$$.c <<EOF
 -#ifdef __clang__
 -indeed
 -#endif
 -EOF
 -	compiler_is_clang=3D`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null =
 | grep -c indeed`
 -	rm -f ${wrkdir}/$$.c
 -
 -	cat >${wrkdir}/$$.c <<EOF
 -#ifdef __GNUC__
 -#ifndef __clang__
 -indeed
 +#define GCC_COMPILER (defined(__GNUC__) && !defined(__clang__))
 +#if GCC_COMPILER
 +gcc
  #endif
 +#ifdef __clang__
 +clang
  #endif
  EOF
 -	compiler_is_gnu=3D`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null | =
 grep -c indeed`
 +	compiler_is_gnu=3D`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null | =
 grep -c gcc`
 +	compiler_is_clang=3D`${testcc:-cc} -E ${wrkdir}/$$.c 2>/dev/null =
 | grep -c clang`
  	rm -f ${wrkdir}/$$.c
 -
 +=09
  }
  get_abi()
  {
 @@ -776,6 +756,7 @@
  	need_awk=3Dno
  	need_sed=3Dno
  	set_opsys=3Dno
 +	check_compiler=3Dyes
  	machine_arch=3D`arch -s`
  	;;
  OSF1)