sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-02 19:36:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bring over some fixes from the other external GCC toolchain ports.

Browse source 
This is generally inspired by the changes in r465416 and subsequent fixes.

- Remove include-fixed headers.
- Strip /usr/local/include from the default include path.
- Use libc++ for C++ instead of libstdc++.
- Force build of a cross compiler if built on a riscv64 host.
- Bump PORTREVISION.

Reviewed by:	lwhsu
Differential Revision:	https://reviews.freebsd.org/D14787
This commit is contained in:
John Baldwin 2018-04-07 00:29:42 +00:00
parent 32f46b71d6
commit 75b43586ed
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=466701
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
devel/riscv64-gcc/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= gcc
PORTVERSION= 7.2.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= riscv64-
@ -32,6 +32,7 @@ GCC_TARGET= ${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
GNU_CONFIGURE= yes
CONFIGURE_OUTSOURCE= yes
CONFIGURE_ARGS= --target=${GCC_TARGET} \
--with-gxx-include-dir=/usr/include/c++/v1/ \
--with-sysroot=/ \
--without-newlib \
--without-headers \
@ -59,12 +60,22 @@ CONFIGURE_ARGS= --target=${GCC_TARGET} \
ALL_TARGET= inhibit-libc=true all-gcc
INSTALL_TARGET= inhibit-libc=true install-gcc
# Force build of a cross compiler even if the target matches the host.
CFLAGS+= -DCROSS_DIRECTORY_STRUCTURE
PLIST_SUB= GCC_TARGET=${GCC_TARGET} \
GCC_VERSION=${PORTVERSION}
post-patch:
@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
${WRKSRC}//gcc/cp/g++spec.c
@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
${WRKSRC}//gcc/Makefile.in
post-install:
@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH} ] ; then ${RM} -r ${STAGEDIR}${PREFIX}/${INFO_PATH}; fi
@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
BROKEN_aarch64= fails to package

15
devel/riscv64-gcc/pkg-plist
View file

@ -9,21 +9,6 @@ bin/%%GCC_TARGET%%-gcc-ranlib
bin/%%GCC_TARGET%%-gcov
bin/%%GCC_TARGET%%-gcov-dump
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
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_lookup.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_nat.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_proxy.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_scan.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/netinet/ip_state.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/stddef.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/stdio.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/stdlib.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/sys/types.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/syslimits.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/unistd.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include-fixed/wchar.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdalign.h