From owner-svn-ports-all@freebsd.org Fri Sep 22 13:05:18 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 5D5D9E282A1; Fri, 22 Sep 2017 13:05:18 +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 29B486B4FD; Fri, 22 Sep 2017 13:05:18 +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 v8MD5HVE051708; Fri, 22 Sep 2017 13:05:17 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MD5Hil051707; Fri, 22 Sep 2017 13:05:17 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201709221305.v8MD5Hil051707@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Fri, 22 Sep 2017 13:05:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450370 - head/lang/gcc48 X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/lang/gcc48 X-SVN-Commit-Revision: 450370 X-SVN-Commit-Repository: ports 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, 22 Sep 2017 13:05:18 -0000 Author: gerald Date: Fri Sep 22 13:05:17 2017 New Revision: 450370 URL: https://svnweb.freebsd.org/changeset/ports/450370 Log: Backport a number of changes from lang/gcc5 and lang/gcc49: - Move ONLY_FOR_ARCHS into the right position of the Makefile. - Omit a comment describing GCC_VERSION and SUFFIX. - Do not quote constant strings compared with ${ARCH}. [1] - Last, but not least the only functional change (and an important one): Remove headers being created by GCC's fixincludes machinery from the installation / packaging to avoid breakage when FreeBSD's headers are changing afterwards. [2] PR: 221905 [1], 222233 [2] Submitted by: linimon [1] Modified: head/lang/gcc48/Makefile Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Fri Sep 22 12:49:03 2017 (r450369) +++ head/lang/gcc48/Makefile Fri Sep 22 13:05:17 2017 (r450370) @@ -3,7 +3,7 @@ PORTNAME= gcc PORTVERSION= 4.8.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= GCC/releases/gcc-${PORTVERSION} PKGNAMESUFFIX= ${SUFFIX} @@ -14,6 +14,8 @@ COMMENT= GNU Compiler Collection 4.8 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi +ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64 sparc64 + LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc @@ -26,11 +28,8 @@ BUILD_DEPENDS+= runtest:misc/dejagnu CPE_VENDOR= gnu -# 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 i386 powerpc powerpc64 sparc64 USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build @@ -51,7 +50,7 @@ CONFIGURE_ARGS+= --disable-multilib .include -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .endif @@ -59,7 +58,7 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} CONFIGURE_ENV+= UNAME_m="powerpc64" .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == armv6 # Override sys.mk including -O in CFLAGS which breaks libgomp building. CFLAGS:= ${CFLAGS:S/-O/-O2/g} . if ${COMPILER_TYPE} == clang @@ -128,6 +127,7 @@ full-regression-test: build post-stage: ${RM} ${STAGEDIR}${PREFIX}/man/man7/* + ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}