| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile.inc,v 1.19 2014/03/01 10:00:49 mrg Exp $ | | 1 | # $NetBSD: Makefile.inc,v 1.20 2014/03/04 09:16:04 mrg Exp $ |
2 | | | 2 | |
3 | .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_ | | 3 | .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_ |
4 | _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1 | | 4 | _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1 |
5 | | | 5 | |
6 | .include <bsd.own.mk> | | 6 | .include <bsd.own.mk> |
7 | | | 7 | |
8 | GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} | | 8 | GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} |
9 | GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/} | | 9 | GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/} |
10 | | | 10 | |
11 | TOP= ${NETBSDSRCDIR} | | 11 | TOP= ${NETBSDSRCDIR} |
12 | DIST= ${TOP}/external/gpl3/gcc/dist | | 12 | DIST= ${TOP}/external/gpl3/gcc/dist |
13 | | | 13 | |
14 | GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH} | | 14 | GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH} |
| @@ -56,27 +56,27 @@ BASEVERSTR= "\"$(BASEVER)\"" | | | @@ -56,27 +56,27 @@ BASEVERSTR= "\"$(BASEVER)\"" |
56 | DEVPHASESTR= "\" $(DEVPHASE)\"" | | 56 | DEVPHASESTR= "\" $(DEVPHASE)\"" |
57 | .else | | 57 | .else |
58 | DEVPHASESTR= "\"\"" | | 58 | DEVPHASESTR= "\"\"" |
59 | .endif | | 59 | .endif |
60 | .if !empty(DATESTAMP) | | 60 | .if !empty(DATESTAMP) |
61 | DATESTAMPSTR= "\" $(DATESTAMP)\"" | | 61 | DATESTAMPSTR= "\" $(DATESTAMP)\"" |
62 | .else | | 62 | .else |
63 | DATESTAMPSTR= "\"\"" | | 63 | DATESTAMPSTR= "\"\"" |
64 | .endif | | 64 | .endif |
65 | | | 65 | |
66 | # XXX pull this out of our configs | | 66 | # XXX pull this out of our configs |
67 | G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html> | | 67 | G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html> |
68 | G_BUGURL_s="\"${G_BUG_URL}\"" | | 68 | G_BUGURL_s="\"${G_BUG_URL}\"" |
69 | G_PKGVERSION=(NetBSD nb1 20131213) | | 69 | G_PKGVERSION=(NetBSD nb2 20140304) |
70 | G_PKGVERSION_s="\"${G_PKGVERSION} \"" | | 70 | G_PKGVERSION_s="\"${G_PKGVERSION} \"" |
71 | | | 71 | |
72 | VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\" \ | | 72 | VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\" \ |
73 | -DDATESTAMP=$(DATESTAMP_s) \ | | 73 | -DDATESTAMP=$(DATESTAMP_s) \ |
74 | -DREVISION=$(REVISION_s) \ | | 74 | -DREVISION=$(REVISION_s) \ |
75 | -DDEVPHASE=$(DEVPHASE_s) \ | | 75 | -DDEVPHASE=$(DEVPHASE_s) \ |
76 | -DPKGVERSION=$(G_PKGVERSION_s) \ | | 76 | -DPKGVERSION=$(G_PKGVERSION_s) \ |
77 | -DBUGURL=$(G_BUGURL_s) | | 77 | -DBUGURL=$(G_BUGURL_s) |
78 | | | 78 | |
79 | CPPFLAGS.version.c+= ${VER_CPPFLAGS} | | 79 | CPPFLAGS.version.c+= ${VER_CPPFLAGS} |
80 | | | 80 | |
81 | .include "${GCCARCH}/defs.mk" | | 81 | .include "${GCCARCH}/defs.mk" |
82 | | | 82 | |