From owner-svn-ports-head@freebsd.org Sat May 27 00:29:57 2017 Return-Path: Delivered-To: svn-ports-head@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 D97BAD823C6; Sat, 27 May 2017 00:29:57 +0000 (UTC) (envelope-from kan@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 96F6B1567; Sat, 27 May 2017 00:29:57 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4R0Tuww098345; Sat, 27 May 2017 00:29:56 GMT (envelope-from kan@FreeBSD.org) Received: (from kan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4R0TudD098343; Sat, 27 May 2017 00:29:56 GMT (envelope-from kan@FreeBSD.org) Message-Id: <201705270029.v4R0TudD098343@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kan set sender to kan@FreeBSD.org using -f From: Alexander Kabaev Date: Sat, 27 May 2017 00:29:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441822 - in head/devel: amd64-gcc powerpc64-gcc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 May 2017 00:29:58 -0000 Author: kan Date: Sat May 27 00:29:56 2017 New Revision: 441822 URL: https://svnweb.freebsd.org/changeset/ports/441822 Log: Make sure come with consistent content Expand hackery in post-install target to make sure that we always end up with same set of $GCC_TARGET-prefixed files no matter if port is built for cross target or for native target to be used as external toolchain. Take over the maintainership. Reviewed by: emaste, imp, bapt Approved by: bapt Differential Revision: https://reviews.freebsd.org/D10537 Modified: head/devel/amd64-gcc/pkg-plist head/devel/powerpc64-gcc/Makefile Modified: head/devel/amd64-gcc/pkg-plist ============================================================================== --- head/devel/amd64-gcc/pkg-plist Sat May 27 00:25:52 2017 (r441821) +++ head/devel/amd64-gcc/pkg-plist Sat May 27 00:29:56 2017 (r441822) @@ -6,6 +6,8 @@ bin/%%GCC_TARGET%%-gcc-%%GCC_VERSION%% bin/%%GCC_TARGET%%-gcc-ar bin/%%GCC_TARGET%%-gcc-nm bin/%%GCC_TARGET%%-gcc-ranlib +bin/%%GCC_TARGET%%-gcov +bin/%%GCC_TARGET%%-gcov-tool lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/README lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/limits.h lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_fil.h @@ -489,3 +491,7 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype +man/man1/%%GCC_TARGET%%-cpp.1.gz +man/man1/%%GCC_TARGET%%-g++.1.gz +man/man1/%%GCC_TARGET%%-gcc.1.gz +man/man1/%%GCC_TARGET%%-gcov.1.gz Modified: head/devel/powerpc64-gcc/Makefile ============================================================================== --- head/devel/powerpc64-gcc/Makefile Sat May 27 00:25:52 2017 (r441821) +++ head/devel/powerpc64-gcc/Makefile Sat May 27 00:29:56 2017 (r441822) @@ -6,7 +6,7 @@ CATEGORIES= devel MASTER_SITES= GCC/releases/gcc-${DISTVERSION} PKGNAMEPREFIX?= powerpc64- -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= kan@FreeBSD.org COMMENT= Cross GNU Compiler Collection for ${PKGNAMEPREFIX:C/-//g} LICENSE= GPLv3 GPLv3RLE @@ -74,11 +74,19 @@ MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 .endif post-install: - @if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \ - mv ${STAGEDIR}${PREFIX}/bin/cpp \ - ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-cpp ; \ +.for f in cpp gcov gcov-tool + @if [ -f ${STAGEDIR}${PREFIX}/bin/$f ] ; then \ + ${MV} ${STAGEDIR}${PREFIX}/bin/$f \ + ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-$f ; \ fi +.endfor .for f in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov gcov-tool + @if [ ! -f ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ] ; then \ + if [ -f ${STAGEDIR}${PREFIX}/man/man1/$f.1 ] ; then \ + ${CP} ${STAGEDIR}${PREFIX}/man/man1/$f.1 \ + ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ; \ + fi \ + fi @${RM} ${STAGEDIR}${PREFIX}/bin/$f @${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1 @${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1.gz