Module Name: src
Committed By: mrg
Date: Thu Nov 28 12:08:57 UTC 2013
Modified Files:
src/doc: 3RDPARTY
src/external/gpl3/gcc/usr.bin: Makefile.backend Makefile.inc
src/lib: Makefile
src/tools/gcc: Makefile README.mknative mknative-gcc
src/tools/mpc: Makefile
Log Message:
update to MPC 1.0.1.
To generate a diff of this commit:
cvs rdiff -u -r1.1064 -r1.1065 src/doc/3RDPARTY
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.208 -r1.209 src/lib/Makefile
cvs rdiff -u -r1.60 -r1.61 src/tools/gcc/Makefile
cvs rdiff -u -r1.16 -r1.17 src/tools/gcc/README.mknative
cvs rdiff -u -r1.73 -r1.74 src/tools/gcc/mknative-gcc
cvs rdiff -u -r1.2 -r1.3 src/tools/mpc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1064 src/doc/3RDPARTY:1.1065
--- src/doc/3RDPARTY:1.1064 Fri Nov 22 16:26:52 2013
+++ src/doc/3RDPARTY Thu Nov 28 12:08:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1064 2013/11/22 16:26:52 christos Exp $
+# $NetBSD: 3RDPARTY,v 1.1065 2013/11/28 12:08:56 mrg Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1357,20 +1357,20 @@ Notes:
3. Carefully check for GPL components leaked into the dist area.
Package: mpc
-Version: 0.9
-Current Vers: 0.9
+Version: 1.0.1
+Current Vers: 1.0.1
Maintainer:
Archive Site: http://www.multiprecision.org/mpc/download/
Home Page: http://www.multiprecision.org/mpc/
Mailing List: http://www.multiprecision.org/index.php?prog=mpc&page=development
Responsible: mrg
-License: LGPL2
-Location: external/lgpl2/mpc/dist
+License: LGPL3
+Location: external/lgpl3/mpc/dist
Notes:
Package: mpfr
Version: 3.0.1
-Current Vers: 3.0.1
+Current Vers: 3.1.2
Maintainer:
Archive Site: http://www.mpfr.org/mpfr-current/
Home Page: http://www.mpfr.org/
@@ -1381,8 +1381,8 @@ Location: external/lgpl3/mpfr/dist
Notes:
Package: GNU MP
-Version: 5.0.2
-Current Vers: 5.0.2
+Version: 5.1.3
+Current Vers: 5.1.2
Maintainer: http://gmplib.org/mailman/listinfo/gmp-devel
Archive Site: http://gmplib.org/
Home Page: http://gmplib.org/
Index: src/external/gpl3/gcc/usr.bin/Makefile.backend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backend:1.2 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.3
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.2 Thu Jul 21 03:13:32 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend Thu Nov 28 12:08:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.2 2011/07/21 03:13:32 mrg Exp $
+# $NetBSD: Makefile.backend,v 1.3 2013/11/28 12:08:56 mrg Exp $
NOMAN= # defined
BINDIR= /usr/libexec
@@ -46,7 +46,7 @@ ${PROG}-checksum.c: genchecksum ${PROG}-
# Find our (local) libraries
LIBGMPDIR!= cd ${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp && ${PRINTOBJDIR}
LIBMPFRDIR!= cd ${NETBSDSRCDIR}/external/lgpl3/mpfr/lib/libmpfr && ${PRINTOBJDIR}
-LIBMPCDIR!= cd ${NETBSDSRCDIR}/external/lgpl2/mpc/lib/libmpc && ${PRINTOBJDIR}
+LIBMPCDIR!= cd ${NETBSDSRCDIR}/external/lgpl3/mpc/lib/libmpc && ${PRINTOBJDIR}
LIBGMP= ${LIBGMPDIR}/libgmp.a
LIBMPFR= ${LIBMPFRDIR}/libmpfr.a
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.15 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.16
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.15 Thu Aug 22 00:17:48 2013
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Thu Nov 28 12:08:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2013/08/22 00:17:48 matt Exp $
+# $NetBSD: Makefile.inc,v 1.16 2013/11/28 12:08:56 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -20,8 +20,8 @@ HOST_CPPFLAGS+= -I${.CURDIR}/..
BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/mpfr.h mpfr.h
BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/mpf2mpfr.h mpf2mpfr.h
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl2/mpc/dist/src/mpc.h mpc.h
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl2/mpc/dist/src/mpc-log.h mpc-log.h
+BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpc/dist/src/mpc.h mpc.h
+BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpc/dist/src/mpc-log.h mpc-log.h
CPPFLAGS+= -I.
# XXX
DPSRCS+= gmp.h mpfr.h mpf2mpfr.h mpc.h mpc-log.h
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.208 src/lib/Makefile:1.209
--- src/lib/Makefile:1.208 Thu Oct 3 20:02:58 2013
+++ src/lib/Makefile Thu Nov 28 12:08:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.208 2013/10/03 20:02:58 mrg Exp $
+# $NetBSD: Makefile,v 1.209 2013/11/28 12:08:56 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -87,7 +87,7 @@ SUBDIR+= ../external/gpl3/gcc/lib/libgom
# specific build area, but we get better parallelism this way.
SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
-SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
+SUBDIR+= ../external/lgpl3/mpc/lib/libmpc
. endif
.endif
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.60 src/tools/gcc/Makefile:1.61
--- src/tools/gcc/Makefile:1.60 Mon Oct 21 08:59:29 2013
+++ src/tools/gcc/Makefile Thu Nov 28 12:08:57 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2013/10/21 08:59:29 skrll Exp $
+# $NetBSD: Makefile,v 1.61 2013/11/28 12:08:57 mrg Exp $
.include <bsd.own.mk>
@@ -130,7 +130,7 @@ native-gcc: .native/.configure_done
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
.if ${HAVE_GCC} >= 45
-MPC= ${NETBSDSRCDIR}/external/lgpl2/mpc
+MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc
MPFR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
GMP= ${NETBSDSRCDIR}/external/lgpl3/gmp
MPCOBJ!= cd ${MPC}/lib/libmpc && ${PRINTOBJDIR}
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.16 src/tools/gcc/README.mknative:1.17
--- src/tools/gcc/README.mknative:1.16 Mon Oct 21 09:02:08 2013
+++ src/tools/gcc/README.mknative Thu Nov 28 12:08:57 2013
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.16 2013/10/21 09:02:08 skrll Exp $
+$NetBSD: README.mknative,v 1.17 2013/11/28 12:08:57 mrg Exp $
This file describes how to bootstrap the native toolchain on a new NetBSD
platform (and how to update the new toolchain files, if needed). These
@@ -53,7 +53,7 @@ work.
"nbmake-MACHINE obj includes dependall install".
8. In each of src/external/lgpl3/gmp/lib/libgmp,
- src/external/lgpl3/mpfr/lib/libmpfr, src/external/lgpl2/mpc/lib/libmpc
+ src/external/lgpl3/mpfr/lib/libmpfr, src/external/lgpl3/mpc/lib/libmpc
do "nbmake-MACHINE obj dependall".
9. In src/lib, do
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.73 src/tools/gcc/mknative-gcc:1.74
--- src/tools/gcc/mknative-gcc:1.73 Sun Oct 20 14:55:28 2013
+++ src/tools/gcc/mknative-gcc Thu Nov 28 12:08:57 2013
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.73 2013/10/20 14:55:28 skrll Exp $
+# $NetBSD: mknative-gcc,v 1.74 2013/11/28 12:08:57 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -31,7 +31,7 @@ sanitise_includes () {
sed \
-e "s,-I$_DESTDIR/usr/include,,g" \
-e "s,-I$_SRC/external/lgpl3/mpfr/dist,,g" \
- -e "s,-I$_SRC/external/lgpl2/mpc/dist/src,,g" \
+ -e "s,-I$_SRC/external/lgpl3/mpc/dist/src,,g" \
-e "s,-I$_SRC/external/lgpl3/gmp/lib/libgmp/arch/$MACHINE_ARCH,,g" \
-e "s,-I/usr/include/[^ ]*,,"
}
Index: src/tools/mpc/Makefile
diff -u src/tools/mpc/Makefile:1.2 src/tools/mpc/Makefile:1.3
--- src/tools/mpc/Makefile:1.2 Sun Apr 15 08:37:32 2012
+++ src/tools/mpc/Makefile Thu Nov 28 12:08:57 2013
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/04/15 08:37:32 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/11/28 12:08:57 mrg Exp $
#
-GNUHOSTDIST= ${.CURDIR}/../../external/lgpl2/mpc/dist
+GNUHOSTDIST= ${.CURDIR}/../../external/lgpl3/mpc/dist
CONFIGURE_ARGS+= --with-gmp=${TOOLDIR:Q} \
--with-mpfr=${TOOLDIR:Q}
