[src/trunk]: src/external/gpl3 put the location of gmp/mpc/mpfr in a variable...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39780e165c00
branches:  trunk
changeset: 355578:39780e165c00
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Aug 04 01:18:39 2017 +0000

description:
put the location of gmp/mpc/mpfr in a variable so we can .old them.

diffstat:

 external/gpl3/gcc.old/usr.bin/Makefile.backend |   8 ++++----
 external/gpl3/gcc.old/usr.bin/Makefile.inc     |  16 ++++++++++------
 external/gpl3/gcc/usr.bin/Makefile.backend     |   8 ++++----
 external/gpl3/gcc/usr.bin/Makefile.inc         |  16 ++++++++++------
 4 files changed, 28 insertions(+), 20 deletions(-)

diffs (104 lines):

diff -r 8df92b367cb1 -r 39780e165c00 external/gpl3/gcc.old/usr.bin/Makefile.backend
--- a/external/gpl3/gcc.old/usr.bin/Makefile.backend    Fri Aug 04 01:06:22 2017 +0000
+++ b/external/gpl3/gcc.old/usr.bin/Makefile.backend    Fri Aug 04 01:18:39 2017 +0000
@@ -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 @@
        @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
diff -r 8df92b367cb1 -r 39780e165c00 external/gpl3/gcc.old/usr.bin/Makefile.inc
--- a/external/gpl3/gcc.old/usr.bin/Makefile.inc        Fri Aug 04 01:06:22 2017 +0000
+++ b/external/gpl3/gcc.old/usr.bin/Makefile.inc        Fri Aug 04 01:18:39 2017 +0000
@@ -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 @@
 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
diff -r 8df92b367cb1 -r 39780e165c00 external/gpl3/gcc/usr.bin/Makefile.backend
--- a/external/gpl3/gcc/usr.bin/Makefile.backend        Fri Aug 04 01:06:22 2017 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.backend        Fri Aug 04 01:18:39 2017 +0000
@@ -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 @@
        @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
diff -r 8df92b367cb1 -r 39780e165c00 external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Fri Aug 04 01:06:22 2017 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Fri Aug 04 01:18:39 2017 +0000
@@ -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 @@
 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