Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
mrg 2017-08-04 01:18:39 +00:00
parent 2c7d87026b
commit bbf2be38c0
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/gpl3/gcc.old/usr.bin/Makefile.backend vendored
View File

@ -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

16
external/gpl3/gcc.old/usr.bin/Makefile.inc vendored
View File

@ -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/locale\" -DNETBSD_NATIVE
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

8
external/gpl3/gcc/usr.bin/Makefile.backend vendored
View File

@ -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

16
external/gpl3/gcc/usr.bin/Makefile.inc vendored
View File

@ -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/locale\" -DNETBSD_NATIVE
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