Date: Mon, 23 Sep 2013 06:49:16 -0700 From: Tim Kientzle <tim@kientzle.com> To: Ian Lepore <ian@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r255775 - head/include Message-ID: <46908E9F-A9B3-4ADF-A5A4-C77F5A479E65@kientzle.com> In-Reply-To: <201309212236.r8LMa7mB019988@svn.freebsd.org> References: <201309212236.r8LMa7mB019988@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This breaks the build in the peculiar case where you have a git checkout of some other project, then a FreeBSD SVN checkout inside of that: Project/.git Project/src/ -- FreeBSD source tree. For some reason newvers.sh is now looking one level too far up, so it's seeing the dir containing the source tree instead of the root of the source tree. This may be related to the use of '.' to run newvers.sh combined with newvers.sh using $(basename $0) to determine the script dir, but I haven't dug through in detail yet. Tim On Sep 21, 2013, at 3:36 PM, Ian Lepore <ian@freebsd.org> wrote: > Author: ian > Date: Sat Sep 21 22:36:07 2013 > New Revision: 255775 > URL: http://svnweb.freebsd.org/changeset/base/255775 >=20 > Log: > Create a separate script to generate osreldate.h rather than sourcing > newvers.sh into a temporary subshell with inline make rules. >=20 > Using a separate script fixes a variety of problems, including = establishing > the correct dependencies in the makefiles. It also eliminates a = problem > with the way newvers.sh uses `realpath $0`, because $0 expands = differently > within a script sourced into a rule in a makefile depending on the = version > of make and of /bin/sh being used. The latter can cause build = breakage in a > cross-build environment, and can also make it difficult to compile = 10.0 on > older pre-10.0 systems. >=20 > PR: 160646 174422 > Submitted by: Garrett Cooper <yaneurabeya@gmail.com> > Approved by: re (gjb) > MFC after: 2 weeks >=20 > Added: > head/include/mk-osreldate.sh (contents, props changed) > Modified: > head/include/Makefile >=20 > Modified: head/include/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/include/Makefile Sat Sep 21 22:24:10 2013 = (r255774) > +++ head/include/Makefile Sat Sep 21 22:36:07 2013 = (r255775) > @@ -104,19 +104,16 @@ SHARED?=3D copies >=20 > INCS+=3D osreldate.h >=20 > -osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh = ${.CURDIR}/../sys/sys/param.h \ > - ${.CURDIR}/Makefile > - @${ECHO} creating osreldate.h from newvers.sh > - @MAKE=3D${MAKE}; \ > - PARAMFILE=3D${.CURDIR}/../sys/sys/param.h; \ > - . ${.CURDIR}/../sys/conf/newvers.sh; \ > - echo "$$COPYRIGHT" > osreldate.h; \ > - echo "#ifdef _KERNEL" >> osreldate.h; \ > - echo "#error \"<osreldate.h> cannot be used in the kernel, use = <sys/param.h>\"" >> osreldate.h; \ > - echo "#else" >> osreldate.h; \ > - echo "#undef __FreeBSD_version" >> osreldate.h; \ > - echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ > - echo "#endif" >> osreldate.h > +NEWVERS_SH=3D ${.CURDIR}/../sys/conf/newvers.sh > +PARAM_H=3D ${.CURDIR}/../sys/sys/param.h > +MK_OSRELDATE_SH=3D ${.CURDIR}/mk-osreldate.sh > + > +osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH} > + env ECHO=3D"${ECHO}" \ > + MAKE=3D"${MAKE}" \ > + NEWVERS_SH=3D${NEWVERS_SH} \ > + PARAM_H=3D${PARAM_H} \ > + ${MK_OSRELDATE_SH} >=20 > .for i in ${LHDRS} > INCSLINKS+=3D sys/$i ${INCLUDEDIR}/$i >=20 > Added: head/include/mk-osreldate.sh > = =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 > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/include/mk-osreldate.sh Sat Sep 21 22:36:07 2013 = (r255775) > @@ -0,0 +1,49 @@ > +#!/bin/sh - > +# Copyright (c) 2013 Garrett Cooper > +# All rights reserved. > +# > +# Redistribution and use in source and binary forms, with or without > +# modification, are permitted provided that the following conditions > +# are met: > +# 1. Redistributions of source code must retain the above copyright > +# notice, this list of conditions and the following disclaimer. > +# 2. Redistributions in binary form must reproduce the above = copyright > +# notice, this list of conditions and the following disclaimer in = the > +# documentation and/or other materials provided with the = distribution. > +# > +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' = AND > +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE > +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE > +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL > +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS > +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) > +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, = STRICT > +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY > +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF > +# SUCH DAMAGE. > +# > +# $FreeBSD$ > + > +set -e > + > +CURDIR=3D$(pwd) > +ECHO=3D${ECHO:=3Decho} > + > +tmpfile=3D$(mktemp osreldate.XXXXXXXX) > +trap "rm -f $tmpfile" EXIT > + > +${ECHO} creating osreldate.h from newvers.sh > + > +export PARAMFILE=3D"${PARAM_H:=3D$CURDIR/../sys/sys/param.h}" > +. "${NEWVERS_SH:=3D$CURDIR/../sys/conf/newvers.sh}" > +cat > $tmpfile <<EOF > +$COPYRIGHT > +#ifdef _KERNEL > +#error "<osreldate.h> cannot be used in the kernel, use = <sys/param.h>" > +#else > +#undef __FreeBSD_version > +#define __FreeBSD_version $RELDATE > +#endif > +EOF > +mv $tmpfile osreldate.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?46908E9F-A9B3-4ADF-A5A4-C77F5A479E65>