Date: Thu, 31 May 2012 20:35:54 -0600 From: Warner Losh <imp@bsdimp.com> To: "David E. O'Brien" <obrien@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r236338 - head/usr.bin/make Message-ID: <1008BCB1-59A9-472C-9D64-1AD57B0A9F43@bsdimp.com> In-Reply-To: <201205302223.q4UMN95p083678@svn.freebsd.org> References: <201205302223.q4UMN95p083678@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
What are your MFC plans for 9.x and 8.x? Warner On May 30, 2012, at 4:23 PM, David E. O'Brien wrote: > Author: obrien > Date: Wed May 30 22:23:08 2012 > New Revision: 236338 > URL: http://svn.freebsd.org/changeset/base/236338 >=20 > Log: > Deprecate the FreeBSD make's ":U" (to-upper case) and ":L" (to-lower = case) > modifiers for ":tu" and ":tl" from OSF's ODE, which made its way into > NetBSD's make, which is the source for the Portable Berkeley Make. >=20 > Submitted by: Simon Gerraty <sjg@juniper.net> >=20 > Modified: > head/usr.bin/make/Makefile > head/usr.bin/make/make.1 > head/usr.bin/make/var.c >=20 > Modified: head/usr.bin/make/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/usr.bin/make/Makefile Wed May 30 22:21:25 2012 = (r236337) > +++ head/usr.bin/make/Makefile Wed May 30 22:23:08 2012 = (r236338) > @@ -15,7 +15,7 @@ NO_SHARED?=3D YES > .endif >=20 > # Version has the RYYYYMMDDX format, where R is from RELENG_<R> > -CFLAGS+=3D-DMAKE_VERSION=3D\"5201111300\" > +CFLAGS+=3D-DMAKE_VERSION=3D\"10201120530\" >=20 > # There is no obvious performance improvement currently. > # CFLAGS+=3D-DUSE_KQUEUE >=20 > Modified: head/usr.bin/make/make.1 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/usr.bin/make/make.1 Wed May 30 22:21:25 2012 = (r236337) > +++ head/usr.bin/make/make.1 Wed May 30 22:23:08 2012 = (r236338) > @@ -902,6 +902,7 @@ Replaces each word in the variable with=20 > Replaces each word in the variable with everything but the last = component. > .It Cm :L > Converts variable to lower-case letters. > +(deprecated) > .It Cm :M Ns Ar pattern > Select only those words that match the rest of the modifier. > The standard shell wildcard characters > @@ -993,8 +994,13 @@ to be replaced in > .Ar new_string . > .It Cm :T > Replaces each word in the variable with its last component. > +.It Cm :tl > +Converts variable to lower-case letters. > +.It Cm :tu > +Converts variable to upper-case letters. > .It Cm :U > Converts variable to upper-case letters. > +(deprecated) > .It Cm :u > Remove adjacent duplicate words (like > .Xr uniq 1 ) . > @@ -1742,6 +1748,19 @@ is set to the same value as > .Va .MAKE ; > support for this may be removed in the future. > .Pp > +The use of the > +.Cm :L > +and > +.Cm :U > +modifiers are deprecated > +in > +.Fx 10.0 > +and the more portable (among Pmake decedents) > +.Cm :tl > +and > +.Cm :tu > +should be used instead. > +.Pp > Most of the more esoteric features of > .Nm > should probably be avoided for greater compatibility. >=20 > Modified: head/usr.bin/make/var.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/usr.bin/make/var.c Wed May 30 22:21:25 2012 = (r236337) > +++ head/usr.bin/make/var.c Wed May 30 22:23:08 2012 = (r236338) > @@ -1746,6 +1746,19 @@ ParseModifier(VarParser *vp, char startc > case 'C': > newStr =3D modifier_C(vp, value, v); > break; > + case 't': > + /* :tl :tu for OSF ODE & NetBSD make = compatibility */ > + switch (vp->ptr[1]) { > + case 'l': > + vp->ptr++; > + goto mod_lower; > + break; > + case 'u': > + vp->ptr++; > + goto mod_upper; > + break; > + } > + /* FALLTHROUGH */ > default: > if (vp->ptr[1] !=3D endc && vp->ptr[1] !=3D ':') = { > #ifdef SUNSHCMD > @@ -1774,6 +1787,7 @@ ParseModifier(VarParser *vp, char startc >=20 > switch (vp->ptr[0]) { > case 'L': > + mod_lower: > { > const char *cp; > Buffer *buf; > @@ -1799,6 +1813,7 @@ ParseModifier(VarParser *vp, char startc > vp->ptr++; > break; > case 'U': > + mod_upper: > { > const char *cp; > Buffer *buf; >=20 >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1008BCB1-59A9-472C-9D64-1AD57B0A9F43>