Page MenuHomeFreeBSD
Files F167771882

D14787.diff
No OneTemporary
Actions

D14787.diff
View Options

Index: head/devel/riscv64-gcc/Makefile
===================================================================
--- head/devel/riscv64-gcc/Makefile
+++ head/devel/riscv64-gcc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gcc
PORTVERSION= 7.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= riscv64-
@@ -32,6 +32,7 @@
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 @@
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
Index: head/devel/riscv64-gcc/pkg-plist
===================================================================
--- head/devel/riscv64-gcc/pkg-plist
+++ head/devel/riscv64-gcc/pkg-plist
@@ -9,21 +9,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 25, 10:30 AM (8 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37202298
Default Alt Text
D14787.diff (2 KB)

Event Timeline