You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Joe Orton <jo...@redhat.com> on 2006/02/06 10:34:26 UTC
Re: svn commit: r374821 - in /httpd/httpd/trunk: CHANGES buildconf server/Makefile.in
On Sat, Feb 04, 2006 at 02:41:06AM -0000, William Rowe wrote:
> Author: wrowe
> Date: Fri Feb 3 18:41:02 2006
> New Revision: 374821
>
> URL: http://svn.apache.org/viewcvs?rev=374821&view=rev
> Log:
> Solaris build proposal; don't fail on missing .h files within
> a VPATH build, and don't test trees with -d (simply -f the
> expected files) in case a tree such as srclib/apr is actually
> a symlink rather than a true directory in ./buildconf.
What's the below change for, is it related to the rest of these changes?
Losing stderr does not look sensible.
> Modified: httpd/httpd/trunk/server/Makefile.in
> URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/Makefile.in?rev=374821&r1=374820&r2=374821&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/Makefile.in (original)
> +++ httpd/httpd/trunk/server/Makefile.in Fri Feb 3 18:41:02 2006
> @@ -59,8 +59,7 @@
> ls $$dir/*.h >> $$tmp; \
> done; \
> for dir in $(EXPORT_DIRS_APR); do \
> - ls $$dir/ap[ru].h >> $$tmp; \
> - ls $$dir/ap[ru]_*.h >> $$tmp; \
> + (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
> done; \
> sort -u $$tmp > $@; \
> rm -f $$tmp
>
Re: svn commit: r374821 - in /httpd/httpd/trunk: CHANGES buildconf
server/Makefile.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Joe Orton wrote:
> On Sat, Feb 04, 2006 at 02:41:06AM -0000, William Rowe wrote:
>
>>Author: wrowe
>>Date: Fri Feb 3 18:41:02 2006
>>New Revision: 374821
>>
>>URL: http://svn.apache.org/viewcvs?rev=374821&view=rev
>>Log:
>> Solaris build proposal; don't fail on missing .h files within
>> a VPATH build, and don't test trees with -d (simply -f the
>> expected files) in case a tree such as srclib/apr is actually
>> a symlink rather than a true directory in ./buildconf.
>
>
> What's the below change for, is it related to the rest of these changes?
> Losing stderr does not look sensible.
Well I've explained this now three times, let me try a different way...
Given vpath srcdir /asf/apr[-util]-svn and builddir /asf/buildapr[-util]
>>--- httpd/httpd/trunk/server/Makefile.in (original)
>>+++ httpd/httpd/trunk/server/Makefile.in Fri Feb 3 18:41:02 2006
>>@@ -59,8 +59,7 @@
>> ls $$dir/*.h >> $$tmp; \
>> done; \
>> for dir in $(EXPORT_DIRS_APR); do \
>>- ls $$dir/ap[ru].h >> $$tmp; \
>>- ls $$dir/ap[ru]_*.h >> $$tmp; \
>>+ (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
expands to
ls /asf/apr-svn/ap[ru].h /asf/apr-svn/ap[ru]_*.h
ls /asf/buildapr/ap[ru].h /asf/buildapr/ap[ru]_*.h
ls /asf/apr-util-svn/ap[ru].h /asf/apr-util-svn/ap[ru]_*.h
ls /asf/buildapr-util/ap[ru].h /asf/buildapr-util/ap[ru]_*.h
each concatinating to the file list.
Lines 1 and 3 above fail for apr.h / apu.h, those aren't in svn, they are
generated targets.
On solaris shell, using solaris make, the lines that fail cause the make
to croak. We don't want to croak, there's no error here. So encapsulating
this into a subshell invocation allows make to ignore this 'fault'.
What stderr don't you like loosing? "File not found"? If we hit that point
it's deliberate, or I assure you the build fails long before that point.
There is no reason to emit white noise at this point in the build.
Bill