Date: Thu, 13 Sep 2007 01:34:58 +0300 From: Giorgos Keramidas <keramida@FreeBSD.org> To: Remko Lodder <remko@elvandar.org> Cc: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: www Makefile Message-ID: <20070912223458.GA2882@kobe.laptop> In-Reply-To: <59771.195.64.94.120.1189615939.squirrel@galain.elvandar.org> References: <200709121649.l8CGnb0p051906@repoman.freebsd.org> <59771.195.64.94.120.1189615939.squirrel@galain.elvandar.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2007-09-12 18:52, Remko Lodder <remko@elvandar.org> wrote:
> On Wed, September 12, 2007 6:49 pm, Giorgos Keramidas wrote:
> > keramida 2007-09-12 16:49:37 UTC
> >
> > FreeBSD doc repository
> >
> > Modified files:
> > . Makefile
> > Log:
> > Tiny toplevel www/Makefile nit.
> >
> > The <bsd.obj.mk> makefile include already pulls in <bsd.subdir.mk>,
> > so including the later again causes spurious warnings about targets
> > being redefined, like:
>
> [snip]
>
> > Removing the extra <bsd.subdir.mk> include fixes this.
>
> [snip]
>
> Thanks Giorgos!!
You're welcome. I was kind of scared about making this change, because
I was not 100% sure that <bsd.obj.mk> pulls in <bsd.subdir.mk> in all
the possible FreeBSD releases people are using to build www/ snapshots.
In particular, I was waiting for a "www build is broken" email from our
automated build.
Then a quick test by looking at the branches on which <bsd.obj.mk> does
*not* automatically pull <bsd.subdir.mk> too showed that:
% kobe:~/ws/bsd/src/share/mk$ cvs -QR up -APCd . && \
% rm -f '.#'* && \
% for bname in \
% $( cvs stat -v bsd.obj.mk | fgrep branch: | \
% awk '{print $1}' ) ; \
% do \
% cvs -QR up -APCd -r "$bname" . && \
% rm -f '.#'* && \
% expand bsd.obj.mk | grep -q 'include[ ]*<bsd.subdir.mk>' ; \
% if [ $? -eq 0 ]; then \
% rc='ok ' ; \
% else \
% rc='err' ; \
% fi ; \
% echo "$rc $bname" ; \
% done
% ok RELENG_6_2
% ok RELENG_5_5
% ok RELENG_6_1
% ok RELENG_6_0
% ok RELENG_6
% ok RELENG_5_4
% ok RELENG_4_11
% ok RELENG_5_3
% ok RELENG_5
% ok RELENG_4_10
% ok RELENG_5_2
% ok RELENG_4_9
% ok RELENG_5_1
% ok RELENG_4_8
% ok RELENG_5_0
% ok RELENG_4_7
% err RELENG_4_6
% err RELENG_4_5
% err RELENG_4_4
% err RELENG_4_3
% ok RELENG_4
% err RELENG_3_2_PAO
% err RELENG_3
% err RELENG_2_2
% err RELENG_2_1_0
So unless someone tries to build the latest and greatest version of our
web site in a system which runs a FreeBSD version older than RELENG_4_6
or RELENG_3, we should be ok :-)
- Giorgos
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070912223458.GA2882>