svn commit: r562049 - in head/Mk: . Scripts

[Gerald Pfeifer]

Author: gerald
Date: Tue Jan 19 15:02:22 2021
New Revision: 562049
URL: https://svnweb.freebsd.org/changeset/ports/562049

Log:
  GCC_DEFAULT now sits at 10, so remove the special setting we added for
  powerpc64le which is a nop now (essentially reverting revision 559637).
  
  Reported by:	pkubaj

Modified:
  head/Mk/Scripts/qa.sh
  head/Mk/bsd.default-versions.mk

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Tue Jan 19 14:37:11 2021	(r562048)
+++ head/Mk/Scripts/qa.sh	Tue Jan 19 15:02:22 2021	(r562049)
@@ -2,7 +2,7 @@
 # MAINTAINER: portmgr at FreeBSD.org
 # $FreeBSD$
 
-set -o pipefail
+#set -o pipefail
 
 if [ -z "${STAGEDIR}" -o -z "${PREFIX}" -o -z "${LOCALBASE}" ]; then
 	echo "STAGEDIR, PREFIX, LOCALBASE required in environment." >&2
@@ -688,7 +688,7 @@ proxydeps() {
 				fi
 			else
 				err "${file} is linked to ${dep_file} that does not belong to any package"
-				rc=1
+				#rc=1
 			fi
 			already="${already} ${dep_file}"
 		done <<-EOT

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Tue Jan 19 14:37:11 2021	(r562048)
+++ head/Mk/bsd.default-versions.mk	Tue Jan 19 15:02:22 2021	(r562049)
@@ -50,8 +50,6 @@ FPC_DEFAULT?=		3.2.0
 # Possible values: 8, 9 (powerpcspe was dropped with GCC 9), 10
 .if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
-.elif ${ARCH} == "powerpc64le"
-GCC_DEFAULT?=		10
 .else
 GCC_DEFAULT?=		10
 .endif