Tue Mar 4 09:16:04 2014 UTC ()
bump local pkg version.


(mrg)
diff -r1.19 -r1.20 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs diff -r1.19 -r1.20 src/external/gpl3/gcc/usr.bin/Makefile.inc (switch to unified diff)

--- src/external/gpl3/gcc/usr.bin/Makefile.inc 2014/03/01 10:00:49 1.19
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc 2014/03/04 09:16:04 1.20
@@ -1,95 +1,95 @@ @@ -1,95 +1,95 @@
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
8GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} 8GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
9GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/} 9GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
10 10
11TOP= ${NETBSDSRCDIR} 11TOP= ${NETBSDSRCDIR}
12DIST= ${TOP}/external/gpl3/gcc/dist 12DIST= ${TOP}/external/gpl3/gcc/dist
13 13
14GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH} 14GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}
15 15
16CPPFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE 16CPPFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE
17HOST_CPPFLAGS+= -I${.CURDIR}/.. 17HOST_CPPFLAGS+= -I${.CURDIR}/..
18 18
19# Link in the GMP/MPFR/MPC headers since we don't install them 19# Link in the GMP/MPFR/MPC headers since we don't install them
20BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h 20BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
21BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpfr.h mpfr.h 21BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpfr.h mpfr.h
22BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpf2mpfr.h mpf2mpfr.h 22BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src/mpf2mpfr.h mpf2mpfr.h
23BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpc/dist/src/mpc.h mpc.h 23BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpc/dist/src/mpc.h mpc.h
24BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpc/dist/src/mpc-log.h mpc-log.h 24BUILDSYMLINKS+= ${NETBSDSRCDIR}/external/lgpl3/mpc/dist/src/mpc-log.h mpc-log.h
25CPPFLAGS+= -I. 25CPPFLAGS+= -I.
26# XXX 26# XXX
27DPSRCS+= gmp.h mpfr.h mpf2mpfr.h mpc.h mpc-log.h 27DPSRCS+= gmp.h mpfr.h mpf2mpfr.h mpc.h mpc-log.h
28 28
29BACKENDOBJ!= cd ${.CURDIR}/../backend && ${PRINTOBJDIR} 29BACKENDOBJ!= cd ${.CURDIR}/../backend && ${PRINTOBJDIR}
30FRONTENDOBJ!= cd ${.CURDIR}/../frontend && ${PRINTOBJDIR} 30FRONTENDOBJ!= cd ${.CURDIR}/../frontend && ${PRINTOBJDIR}
31 31
32.if ${USETOOLS} == "yes" 32.if ${USETOOLS} == "yes"
33NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcompat 33NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcompat
34.endif 34.endif
35 35
36GNUHOSTDIST= ${DIST} 36GNUHOSTDIST= ${DIST}
37BUILD_PREFIX= ${C_BUILD_PREFIX} 37BUILD_PREFIX= ${C_BUILD_PREFIX}
38 38
39HOSTLIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR} 39HOSTLIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
40HOSTLIBIBERTY= ${HOSTLIBIBERTYOBJ}/libiberty/libiberty.a 40HOSTLIBIBERTY= ${HOSTLIBIBERTYOBJ}/libiberty/libiberty.a
41 41
42BASEVER!= cat ${GNUHOSTDIST}/gcc/BASE-VER 42BASEVER!= cat ${GNUHOSTDIST}/gcc/BASE-VER
43.if exists(${GNUHOSTDIST}/gcc/DEV-PHASE) 43.if exists(${GNUHOSTDIST}/gcc/DEV-PHASE)
44DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE 44DEVPHASE!= cat ${GNUHOSTDIST}/gcc/DEV-PHASE
45.else 45.else
46DEVPHASE= 46DEVPHASE=
47.endif 47.endif
48.if ${DEVPHASE} == "release" || ${DEVPHASE} == "" 48.if ${DEVPHASE} == "release" || ${DEVPHASE} == ""
49DATESTAMP= 49DATESTAMP=
50.else 50.else
51DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP 51DATESTAMP!= cat ${GNUHOSTDIST}/gcc/DATESTAMP
52.endif 52.endif
53 53
54BASEVERSTR= "\"$(BASEVER)\"" 54BASEVERSTR= "\"$(BASEVER)\""
55.if !empty(DEVPHASE) 55.if !empty(DEVPHASE)
56DEVPHASESTR= "\" $(DEVPHASE)\"" 56DEVPHASESTR= "\" $(DEVPHASE)\""
57.else 57.else
58DEVPHASESTR= "\"\"" 58DEVPHASESTR= "\"\""
59.endif 59.endif
60.if !empty(DATESTAMP) 60.if !empty(DATESTAMP)
61DATESTAMPSTR= "\" $(DATESTAMP)\"" 61DATESTAMPSTR= "\" $(DATESTAMP)\""
62.else 62.else
63DATESTAMPSTR= "\"\"" 63DATESTAMPSTR= "\"\""
64.endif 64.endif
65 65
66# XXX pull this out of our configs 66# XXX pull this out of our configs
67G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html> 67G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html>
68G_BUGURL_s="\"${G_BUG_URL}\"" 68G_BUGURL_s="\"${G_BUG_URL}\""
69G_PKGVERSION=(NetBSD nb1 20131213)  69G_PKGVERSION=(NetBSD nb2 20140304)
70G_PKGVERSION_s="\"${G_PKGVERSION} \"" 70G_PKGVERSION_s="\"${G_PKGVERSION} \""
71 71
72VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\" \ 72VER_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
79CPPFLAGS.version.c+= ${VER_CPPFLAGS} 79CPPFLAGS.version.c+= ${VER_CPPFLAGS}
80 80
81.include "${GCCARCH}/defs.mk" 81.include "${GCCARCH}/defs.mk"
82 82
83.if ${MKPIC} != "no" 83.if ${MKPIC} != "no"
84.if ${G_ENABLE_SHARED} == "yes" && ${G_SHLIB_LINK} != "" 84.if ${G_ENABLE_SHARED} == "yes" && ${G_SHLIB_LINK} != ""
85CPPFLAGS+= -DENABLE_SHARED_LIBGCC 85CPPFLAGS+= -DENABLE_SHARED_LIBGCC
86.endif 86.endif
87 87
88.if empty(G_SHLIB_MULTILIB) 88.if empty(G_SHLIB_MULTILIB)
89CPPFLAGS+= -DNO_SHARED_LIBGCC_MULTILIB 89CPPFLAGS+= -DNO_SHARED_LIBGCC_MULTILIB
90.endif 90.endif
91.endif 91.endif
92 92
93NOCLANGERROR= # defined 93NOCLANGERROR= # defined
94 94
95.endif 95.endif