From owner-svn-ports-all@freebsd.org Fri Feb 3 15:05:39 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6C82CCE0AA; Fri, 3 Feb 2017 15:05:39 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B4A2ECF; Fri, 3 Feb 2017 15:05:39 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v13F5cfT035794; Fri, 3 Feb 2017 15:05:38 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v13F5cff035793; Fri, 3 Feb 2017 15:05:38 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201702031505.v13F5cff035793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Fri, 3 Feb 2017 15:05:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433246 - head/lang/gcc49 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2017 15:05:39 -0000 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