Module Name: src
Committed By: mrg
Date: Fri Aug 4 01:18:39 UTC 2017
Modified Files:
src/external/gpl3/gcc.old/usr.bin: Makefile.backend Makefile.inc
src/external/gpl3/gcc/usr.bin: Makefile.backend Makefile.inc
Log Message:
put the location of gmp/mpc/mpfr in a variable so we can .old them.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc.old/usr.bin/Makefile.backend
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc.old/usr.bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/usr.bin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/usr.bin/Makefile.backend
diff -u src/external/gpl3/gcc.old/usr.bin/Makefile.backend:1.5 src/external/gpl3/gcc.old/usr.bin/Makefile.backend:1.6
--- src/external/gpl3/gcc.old/usr.bin/Makefile.backend:1.5 Sun Jul 23 01:12:16 2017
+++ src/external/gpl3/gcc.old/usr.bin/Makefile.backend Fri Aug 4 01:18:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.5 2017/07/23 01:12:16 mrg Exp $
+# $NetBSD: Makefile.backend,v 1.6 2017/08/04 01:18:39 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -32,9 +32,9 @@ CFLAGS:= ${CXXFLAGS}
@true
# 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/lgpl3/mpc/lib/libmpc && ${PRINTOBJDIR}
+LIBGMPDIR!= cd ${GMPDISTDIR}/lib/libgmp && ${PRINTOBJDIR}
+LIBMPFRDIR!= cd ${MPFRDISTDIR}/lib/libmpfr && ${PRINTOBJDIR}
+LIBMPCDIR!= cd ${MPCDISTDIR}/lib/libmpc && ${PRINTOBJDIR}
LIBGMP= ${LIBGMPDIR}/libgmp.a
LIBMPFR= ${LIBMPFRDIR}/libmpfr.a
Index: src/external/gpl3/gcc.old/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.6 src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.7
--- src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.6 Sun Jul 23 01:12:16 2017
+++ src/external/gpl3/gcc.old/usr.bin/Makefile.inc Fri Aug 4 01:18:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2017/07/23 01:12:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2017/08/04 01:18:39 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -19,11 +19,15 @@ CPPFLAGS+= -DLOCALEDIR=\"/usr/share/loca
HOST_CPPFLAGS+= -I${.CURDIR}/..
# Link in the GMP/MPFR/MPC headers since we don't install them
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpfr.h mpfr.h
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpf2mpfr.h mpf2mpfr.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
+GMPDISTDIR= ${NETBSDSRCDIR}/external/lgpl3/gmp
+MPFRDISTDIR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
+MPCDISTDIR= ${NETBSDSRCDIR}/external/lgpl3/mpc
+
+BUILDSYMLINKS+= ${GMPDISTDIR}/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
+BUILDSYMLINKS+= ${MPFRDISTDIR}/dist/src/mpfr.h mpfr.h
+BUILDSYMLINKS+= ${MPFRDISTDIR}/dist/src/mpf2mpfr.h mpf2mpfr.h
+BUILDSYMLINKS+= ${MPCDISTDIR}/dist/src/mpc.h mpc.h
+BUILDSYMLINKS+= ${MPCDISTDIR}/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/external/gpl3/gcc/usr.bin/Makefile.backend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backend:1.5 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.6
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.5 Fri Apr 4 01:19:14 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend Fri Aug 4 01:18:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.5 2014/04/04 01:19:14 christos Exp $
+# $NetBSD: Makefile.backend,v 1.6 2017/08/04 01:18:39 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -32,9 +32,9 @@ CFLAGS:= ${CXXFLAGS}
@true
# 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/lgpl3/mpc/lib/libmpc && ${PRINTOBJDIR}
+LIBGMPDIR!= cd ${GMPDISTDIR}/lib/libgmp && ${PRINTOBJDIR}
+LIBMPFRDIR!= cd ${MPFRDISTDIR}/lib/libmpfr && ${PRINTOBJDIR}
+LIBMPCDIR!= cd ${MPCDISTDIR}/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.27 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.28
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.27 Tue Apr 19 21:11:05 2016
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Fri Aug 4 01:18:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2016/04/19 21:11:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.28 2017/08/04 01:18:39 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -19,11 +19,15 @@ CPPFLAGS+= -DLOCALEDIR=\"/usr/share/loca
HOST_CPPFLAGS+= -I${.CURDIR}/..
# Link in the GMP/MPFR/MPC headers since we don't install them
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpfr.h mpfr.h
-BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpf2mpfr.h mpf2mpfr.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
+GMPDISTDIR= ${NETBSDSRCDIR}/external/lgpl3/gmp
+MPFRDISTDIR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
+MPCDISTDIR= ${NETBSDSRCDIR}/external/lgpl3/mpc
+
+BUILDSYMLINKS+= ${GMPDISTDIR}/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
+BUILDSYMLINKS+= ${MPFRDISTDIR}/dist/src/mpfr.h mpfr.h
+BUILDSYMLINKS+= ${MPFRDISTDIR}/dist/src/mpf2mpfr.h mpf2mpfr.h
+BUILDSYMLINKS+= ${MPCDISTDIR}/dist/src/mpc.h mpc.h
+BUILDSYMLINKS+= ${MPCDISTDIR}/dist/src/mpc-log.h mpc-log.h
CPPFLAGS+= -I.
# XXX
DPSRCS+= gmp.h mpfr.h mpf2mpfr.h mpc.h mpc-log.h
