From 32f46b71d644f8895eec87ba18209692e1b5d10b Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 7 Apr 2018 00:26:46 +0000
Subject: [PATCH] Fix two more issues with r465416.

- Force build of a cross-compiler by defining CROSS_DIRECTORY_STRUCTURE
  in CFLAGS even if the build host matches the build target.  This
  fixes such a cross compiler to not include /usr/local/lib in its default
  library path (e.g. amd64-gcc when built on amd64).
- Don't remove the include-fixed headers for the aarch64-none-elf-gcc
  and arm-none-eabi-gcc packages.
- Bump PORTREVISION.

Reported by:	kevans (2)
Reviewed by:	bdrewery, kevans
Differential Revision:	https://reviews.freebsd.org/D14925
---
 devel/aarch64-none-elf-gcc/pkg-plist | 3 +++
 devel/arm-none-eabi-gcc/pkg-plist    | 3 +++
 devel/powerpc64-gcc/Makefile         | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/devel/aarch64-none-elf-gcc/pkg-plist b/devel/aarch64-none-elf-gcc/pkg-plist
index 84f56eb3e076..6bec03267c86 100644
--- a/devel/aarch64-none-elf-gcc/pkg-plist
+++ b/devel/aarch64-none-elf-gcc/pkg-plist
@@ -20,6 +20,9 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/ilp32/crti.o
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/ilp32/crtn.o
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/ilp32/libgcc.a
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/ilp32/libgcov.a
+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/syslimits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_neon.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
diff --git a/devel/arm-none-eabi-gcc/pkg-plist b/devel/arm-none-eabi-gcc/pkg-plist
index 5b09c03ca688..1f91f97836ea 100644
--- a/devel/arm-none-eabi-gcc/pkg-plist
+++ b/devel/arm-none-eabi-gcc/pkg-plist
@@ -13,6 +13,9 @@ lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/crtend.o
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/crtfastmath.o
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/crti.o
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/crtn.o
+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/syslimits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_neon.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile
index d2aab53b3c13..c43a89bcf677 100644
--- a/devel/powerpc64-gcc/Makefile
+++ b/devel/powerpc64-gcc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMEPREFIX?=	powerpc64-
@@ -54,6 +54,9 @@ CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 ALL_TARGET?=	all-gcc
 INSTALL_TARGET?=	install-gcc
 
+# Force build of a cross compiler even if the target matches the host.
+CFLAGS+=	-DCROSS_DIRECTORY_STRUCTURE
+
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
@@ -95,7 +98,9 @@ post-install:
 .endfor
 	@${RM} ${STAGEDIR}${PREFIX}/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+.if empty(PKGNAMEPREFIX:M*-*-)
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+.endif
 
 # This port and all its slave ports fail on aarch64 -- but not all
 # the same way.  Provide this definition for the master.