Page MenuHomeFreeBSD
Files F153912192

D15267.id42067.diff
No OneTemporary
Actions

D15267.id42067.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1101,15 +1101,13 @@
.endif
CONFIGURE_ENV+= HOSTCC="${HOSTCC}" HOSTCXX="${HOSTCXX}" CC_FOR_BUILD="${CC_FOR_BUILD}" CXX_FOR_BUILD="${CXX_FOR_BUILD}"
-CC= ${XCC}
-CXX= ${XCXX}
-CFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include
-CXXFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include -isystem ${CROSS_SYSROOT}/usr/include/c++/v1 -nostdinc++
-CPPFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include
-LDFLAGS+= --sysroot=${CROSS_SYSROOT}
+CC= ${XCC} --sysroot=${CROSS_SYSROOT}
+CXX= ${XCXX} --sysroot=${CROSS_SYSROOT}
+CPP= ${XCPP} --sysroot=${CROSS_SYSROOT}
.for _tool in AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
${_tool}= ${CROSS_BINUTILS_PREFIX}${tool:tl}
.endfor
+LD+= --sysroot=${CROSS_SYSROOT}
STRIP_CMD= ${CROSS_BINUTILS_PREFIX}strip
# only bmake support the below
STRIPBIN= ${STRIP_CMD}
@@ -1147,6 +1145,10 @@
.if !defined(ARCH)
ARCH!= ${UNAME} -p
.endif
+HOSTARCH:= ${ARCH}
+.if defined(CROSS_TOOLCHAIN)
+ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,}
+.endif
_EXPORTED_VARS+= ARCH
# Get the operating system type
@@ -2633,7 +2635,7 @@
CONFIGURE_SCRIPT?= configure
CONFIGURE_CMD?= ./${CONFIGURE_SCRIPT}
-CONFIGURE_TARGET?= ${ARCH}-portbld-${OPSYS:tl}${OSREL}
+CONFIGURE_TARGET?= ${HOSTARCH}-portbld-${OPSYS:tl}${OSREL}
CONFIGURE_TARGET:= ${CONFIGURE_TARGET:S/--build=//}
CONFIGURE_LOG?= config.log
Index: base/binutils/Makefile
===================================================================
--- base/binutils/Makefile
+++ base/binutils/Makefile
@@ -8,7 +8,7 @@
COMMENT= GNU binary tools for base
MASTERDIR= ${.CURDIR}/../../devel/binutils
-PLIST= ${.CURDIR}/pkg-plist.${TARGET_ARCH}
+PLIST= ${.CURDIR}/pkg-plist.${ARCH}
.if !defined(CROSS_TOOLCHAIN)
.error Please define CROSS_TOOLCHAIN before building
@@ -18,8 +18,7 @@
.error Please define CROSS_SYSROOT before building
.endif
-TARGET_ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,}
-BUTARGET= ${TARGET_ARCH}-unknown-${OPSYS:tl}${OSREL}
+BUTARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
CONFIGURE_ARGS+= --disable-host-shared
PREFIX= /usr
Index: base/gcc/Makefile
===================================================================
--- base/gcc/Makefile
+++ base/gcc/Makefile
@@ -34,16 +34,15 @@
AS_FOR_TARGET=/usr/bin/as \
LD_FOR_TARGET=/usr/bin/ld \
NM_FOR_TARGET=/usr/bin/nm
-TARGET_ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,}
-GCC_TARGET= ${TARGET_ARCH}-unknown-${OPSYS:tl}${OSREL}
+GCC_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL}
USES= gmake libtool tar:bzip2 makeinfo
-PLIST_SUB= TARGETARCH=${TARGET_ARCH} \
+PLIST_SUB= TARGETARCH=${ARCH} \
OPSYS=${OPSYS:tl} \
GCC_TARGET=${GCC_TARGET} \
GCC_VERSION=${PORTVERSION}
-TARGET_ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,}
EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/freebsd-format-extensions
+EXTRA_PATCHES+= ${.CURDIR}/../../devel/powerpc64-gcc/files/patch-gcc-freebsd-mips
GNU_CONFIGURE= yes
CONFIGURE_OUTSOURCE= yes
@@ -52,12 +51,26 @@
--enable-languages=c,c++ \
--disable-nls \
--without-headers \
+ --with-gxx-include-dir=/usr/include/c++/v1/ \
--with-build-sysroot=${CROSS_SYSROOT} \
-with-pkgversion="GNU Collection for FreeBSD"
ALL_TARGET?= all-gcc
INSTALL_TARGET?= install-gcc
+.include <bsd.port.pre.mk>
+
+.if ${ARCH:Mmips*}
+PLIST_SUB+= MIPS=""
+.else
+PLIST_SUB+= MIPS="@comment "
+.endif
+.if ${ARCH:Mpowerpc*}
+PLIST_SUB+= POWERPC=""
+.else
+PLIST_SUB+= POWERPC="@comment "
+.endif
+
post-extract:
cd ${WRKSRC}; ${LN} -sf ../mpfr-3.1.6 mpfr ; \
${LN} -sf ../gmp-6.1.2 gmp ; \
@@ -66,6 +79,8 @@
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:
${MV} ${STAGEDIR}/usr/bin/gcov-tool ${STAGEDIR}/usr/bin/${GCC_TARGET}-gcov-tool ; \
@@ -81,5 +96,6 @@
${LN} -sf ${GCC_TARGET}-gcc ${STAGEDIR}/usr/bin/cc ; \
${LN} -sf ${GCC_TARGET}-gcc.1.gz ${STAGEDIR}/${MANDIR}1/cc.1.gz
${RM} -r ${STAGEDIR}/usr/share/info
+ ${RM} -r ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
.include <bsd.port.mk>
Index: base/gcc/pkg-plist
===================================================================
--- base/gcc/pkg-plist
+++ base/gcc/pkg-plist
@@ -14,33 +14,18 @@
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/libmilter/mfapi.h
-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/altivec.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/loongson.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdalign.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdarg.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdatomic.h
@@ -52,7 +37,7 @@
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdnoreturn.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tgmath.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/varargs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/vec_types.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/vec_types.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixinc_list
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/gsyslimits.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/README
@@ -109,21 +94,27 @@
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/collect2.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/conditions.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/elfos.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-spec.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-stdint.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-opts.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-protos.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/configargs.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/context.h
lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/convert.h

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 25, 6:02 PM (4 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32136444
Default Alt Text
D15267.id42067.diff (10 KB)

Event Timeline