svn commit: r433246 - head/lang/gcc49

[Gerald Pfeifer]

Author: gerald
Date: Fri Feb  3 15:05:38 2017
New Revision: 433246
URL: https://svnweb.freebsd.org/changeset/ports/433246

Log:
  Remove extraneous definition of DISTVERSION (which in general we
  only need for ports tracking weekly GCC snapshots) and simplify
  the definition of GCC_VERSION.
  
  Remove traces of armv6hf which no longer exists as an arch. [1]
  
  Reported by:	andreast [1]

Modified:
  head/lang/gcc49/Makefile

Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile	Fri Feb  3 14:25:58 2017	(r433245)
+++ head/lang/gcc49/Makefile	Fri Feb  3 15:05:38 2017	(r433246)
@@ -28,12 +28,11 @@ CONFLICTS=	gcc-4.9.*
 CPE_VENDOR=	gnu
 CPE_VERSION=	${GCC_VERSION}
 
-# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
-# of executables and directories once installed.
-DISTVERSION=	${PORTVERSION}
-GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
+# GCC_VERSION and SUFFIX relate to names of executables and directories
+# once installed.
+GCC_VERSION=	${PORTVERSION}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
-ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64
+ONLY_FOR_ARCHS=	amd64 armv6 i386 powerpc powerpc64 sparc64
 USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
 USE_PERL5=	build
@@ -68,8 +67,8 @@ CONFIGURE_TARGET=	x86_64-portbld-${OPSYS
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 .endif
 
-.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
-# We have to override the sys.mk -O CFLAGS since it breaks libgomp building.
+.if ${ARCH} == "armv6"
+# Override sys.mk including -O in CFLAGS which breaks libgomp building.
 CFLAGS:=	${CFLAGS:S/-O/-O2/g}
 . if ${COMPILER_TYPE} == clang
 .  if empty(PORT_OPTIONS:MBOOTSTRAP)
@@ -119,7 +118,7 @@ INFO=		gcc${SUFFIX}/cpp \
 #.if ${ARCH} == "i386" || ${ARCH} == "amd64"
 INFO+=		gcc${SUFFIX}/libquadmath
 #.endif
-.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "armv6"
 INFO+=		gcc${SUFFIX}/libitm
 .endif