MFH: r466699

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

Approved by:	ports-secteam (feld)
This commit is contained in:
Kyle Evans 2018-04-18 16:57:36 +00:00
parent d1097a1892
commit 202cd1ced8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=467715
3 changed files with 12 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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.