diff options
| author | kan <kan@FreeBSD.org> | 2017-05-27 08:29:56 +0800 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2017-05-27 08:29:56 +0800 |
| commit | 22af33bfe875838704953c07b2cbe267590b512e (patch) | |
| tree | efbaefeb7d7a3fb56f3d823d65c8cd2b365c3366 | |
| parent | 3c0653592c311d1a0447f9e97ba7edb4852ec722 (diff) | |
| download | freebsd-ports-gnome-22af33bfe875838704953c07b2cbe267590b512e.tar.gz freebsd-ports-gnome-22af33bfe875838704953c07b2cbe267590b512e.tar.zst freebsd-ports-gnome-22af33bfe875838704953c07b2cbe267590b512e.zip | |
Make sure <arch-gcc> 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
| -rw-r--r-- | devel/amd64-gcc/pkg-plist | 6 | ||||
| -rw-r--r-- | devel/powerpc64-gcc/Makefile | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/devel/amd64-gcc/pkg-plist b/devel/amd64-gcc/pkg-plist index 2f3f91211138..75fb56212022 100644 --- a/devel/amd64-gcc/pkg-plist +++ b/devel/amd64-gcc/pkg-plist @@ -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%%/liblto_plugin.so.0.0.0 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 diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile index e99ac2bd3734..bed0a0faa939 100644 --- a/devel/powerpc64-gcc/Makefile +++ b/devel/powerpc64-gcc/Makefile @@ -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 |