Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)
- Fix for possible unset uid/gid in toproto
- Fix for default mtree style
- Update libelf
- Importing libexecinfo
- Resynchronize GCC, mpc, gmp, mpfr
- build.sh: Replace params with show-params.
This has been done as the make target has been renamed in the same
way, while a new target named params has been added. This new
target generates a file containing all the parameters, instead of
printing it on the console.
- Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
get getservbyport() out of the inner loop
Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
+45
-35
@@ -1,34 +1,21 @@
|
||||
# $NetBSD: Makefile,v 1.52 2012/09/18 07:05:15 skrll Exp $
|
||||
# $NetBSD: Makefile,v 1.61 2013/11/28 12:08:57 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
GCC_LANGUAGES=c c++ objc
|
||||
MODULE= gcc4
|
||||
|
||||
MKNATIVE_CONFIG_TARGET_LIBS= \
|
||||
configure-target-libstdc++-v3 \
|
||||
configure-target-libobjc
|
||||
|
||||
.if ${HAVE_GCC} == 45
|
||||
MKNATIVE_TARGET= gcc45
|
||||
GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/gcc/dist
|
||||
MKNATIVE_CONFIG_TARGET_LIBS+= \
|
||||
configure-target-libgomp
|
||||
.else
|
||||
MKNATIVE_TARGET= gcc4
|
||||
.endif
|
||||
|
||||
BINENV= /usr/bin/env -i
|
||||
|
||||
VAX_CONFIGURE_ARGS=
|
||||
|
||||
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
|
||||
MULTILIB_ARGS= --enable-multilib
|
||||
.else
|
||||
MULTILIB_ARGS= --disable-multilib
|
||||
.endif
|
||||
|
||||
.if ${MKSOFTFLOAT} != "no"
|
||||
.if ${MKSOFTFLOAT} != "no" && ${MACHINE_CPU} != "m68k"
|
||||
SOFTFLOAT_ARGS= -with-float=soft
|
||||
.endif
|
||||
|
||||
@@ -38,14 +25,12 @@ COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
|
||||
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
|
||||
--with-pkgversion="NetBSD nb1 20120916" \
|
||||
--with-system-zlib \
|
||||
${VAX_CONFIGURE_ARGS} \
|
||||
--enable-__cxa_atexit
|
||||
.if defined(__MINIX)
|
||||
COMMON_CONFIGURE_ARGS+= \
|
||||
--disable-libssp \
|
||||
--disable-threads \
|
||||
--enable-visibility \
|
||||
--disable-libunwind
|
||||
--disable-threads
|
||||
|
||||
CONFIGURE_ENV+= gcc_cv_ld_hidden=yes
|
||||
|
||||
@@ -87,6 +72,29 @@ MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
|
||||
CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes \
|
||||
gcc_cv_as_sparc_gotdata_op=no
|
||||
|
||||
ALL_TARGET= all-gcc
|
||||
INSTALL_TARGET= install-gcc
|
||||
|
||||
.include "${.CURDIR}/../Makefile.gmakehost"
|
||||
BUILD_MAKE=${TOOL_GMAKE}
|
||||
|
||||
#
|
||||
# mknative-gcc specific stuff
|
||||
#
|
||||
MKNATIVE_CONFIG_TARGET_LIBS= \
|
||||
configure-target-libstdc++-v3 \
|
||||
configure-target-libobjc
|
||||
|
||||
.if ${HAVE_GCC} == 45
|
||||
MKNATIVE_TARGET= gcc45
|
||||
MKNATIVE_CONFIG_TARGET_LIBS+= \
|
||||
configure-target-libgomp
|
||||
.else
|
||||
MKNATIVE_TARGET= gcc4
|
||||
.endif
|
||||
|
||||
BINENV= /usr/bin/env -i
|
||||
|
||||
MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
|
||||
CC_FOR_BUILD=${HOST_CC:Q} \
|
||||
CC=${CC:Q}' '${CCADDFLAGS:Q} \
|
||||
@@ -108,16 +116,6 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
|
||||
gdb_cv_scanf_has_long_double=yes \
|
||||
gcc_cv_as_sparc_gotdata_op=no
|
||||
|
||||
ALL_TARGET= all-gcc
|
||||
INSTALL_TARGET= install-gcc
|
||||
|
||||
.include "${.CURDIR}/../Makefile.gmakehost"
|
||||
BUILD_MAKE=${TOOL_GMAKE}
|
||||
|
||||
#
|
||||
# mknative-gcc specific stuff
|
||||
#
|
||||
|
||||
.if ${HAVE_GCC} < 45
|
||||
GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
|
||||
.else
|
||||
@@ -127,27 +125,39 @@ GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
|
||||
CXXADDFLAGS= --sysroot=${DESTDIR}
|
||||
CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
|
||||
|
||||
# NEWCONFIGDIR can be set to a read-write location of the source tree
|
||||
# in case the version being used is not.
|
||||
NEWCONFIGDIR?= ${.CURDIR}/../..
|
||||
MKNATIVE?= ${.CURDIR}/mknative-gcc
|
||||
|
||||
bootstrap-libgcc: .configure_done
|
||||
@echo 'Creating files needed for libgcc by a native bootstrap build.'
|
||||
@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MKNATIVE_TARGET} \
|
||||
${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
|
||||
${DESTDIR}
|
||||
${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
|
||||
${MACHINE_GNU_PLATFORM} ${DESTDIR}
|
||||
|
||||
native-gcc: .native/.configure_done
|
||||
@echo 'Extracting GNU GCC configury for a native toolchain.'
|
||||
@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
|
||||
${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
|
||||
${DESTDIR}
|
||||
${.OBJDIR}/.native ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
|
||||
${MACHINE_GNU_PLATFORM} ${DESTDIR}
|
||||
|
||||
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
|
||||
.if ${HAVE_GCC} >= 45
|
||||
MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc
|
||||
MPFR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
|
||||
GMP= ${NETBSDSRCDIR}/external/lgpl3/gmp
|
||||
MPCOBJ!= cd ${MPC}/lib/libmpc && ${PRINTOBJDIR}
|
||||
MPFROBJ!= cd ${MPFR}/lib/libmpfr && ${PRINTOBJDIR}
|
||||
GMPOBJ!= cd ${GMP}/lib/libgmp && ${PRINTOBJDIR}
|
||||
|
||||
NATIVE_CONFIGURE_ARGS+= \
|
||||
--with-mpc=${DESTDIR}/usr \
|
||||
--with-mpfr=${DESTDIR}/usr \
|
||||
--with-gmp=${DESTDIR}/usr
|
||||
--with-mpc-lib=${MPCOBJ} \
|
||||
--with-mpfr-lib=${MPFROBJ} \
|
||||
--with-gmp-lib=${GMPOBJ} \
|
||||
--with-mpc-include=${MPC}/dist/src \
|
||||
--with-mpfr-include=${MPFR}/dist \
|
||||
--with-gmp-include=${GMP}/lib/libgmp/arch/${MACHINE_ARCH}
|
||||
|
||||
. if ${MACHINE_ARCH} != "vax"
|
||||
NATIVE_CONFIGURE_ARGS+= --enable-tls
|
||||
|
||||
Reference in New Issue
Block a user