You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/05/20 00:58:37 UTC
svn commit: r946475 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Wed May 19 22:58:37 2010
New Revision: 946475
URL: http://svn.apache.org/viewvc?rev=946475&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Fix a comment typo. Set LD_LIBRARY_PATH
when running tests for perl and python bindings.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=946475&r1=946474&r2=946475&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed May 19 22:58:37 2010
@@ -318,7 +318,7 @@ apr-util-clean:
-(cd $(APR_UTIL_OBJDIR) && make clean)
-# retrieve apr if not present yet
+# retrieve apr-util if not present yet
$(APR_UTIL_OBJDIR)/.retrieved:
[ -d $(APR_UTIL_OBJDIR) ] || mkdir -p $(APR_UTIL_OBJDIR)
if [ ! -d $(APR_UTIL_SRCDIR) ]; then \
@@ -815,9 +815,11 @@ RUBYLIB=$(SVN_PREFIX)/lib/ruby/site_ruby
grep ^svn_cv_ruby_sitedir_libsuffix $(svn_builddir)/config.log | \
cut -d'=' -f2)
svn-check-swig-pl:
- cd $(svn_builddir) && make check-swig-pl
+ cd $(svn_builddir) && \
+ env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) make check-swig-pl
svn-check-swig-py:
- cd $(svn_builddir) && make check-swig-py
+ cd $(svn_builddir) && \
+ env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) make check-swig-py
svn-check-swig-rb:
cd $(svn_builddir)/subversion/bindings/swig/ruby/test && \
env RUBYLIB=$(RUBYLIB) \
Re: svn commit: r946475 -
/subversion/trunk/tools/dev/unix-build/Makefile.svn
Posted by Stefan Sperling <st...@elego.de>.
On Wed, May 19, 2010 at 04:06:05PM -0700, Blair Zajac wrote:
> On 05/19/2010 03:58 PM, stsp@apache.org wrote:
> >Author: stsp
> >Date: Wed May 19 22:58:37 2010
> >New Revision: 946475
> >
> >URL: http://svn.apache.org/viewvc?rev=946475&view=rev
> >Log:
> >* tools/dev/unix-build/Makefile.svn: Fix a comment typo. Set LD_LIBRARY_PATH
> > when running tests for perl and python bindings.
> >
>
> > svn-check-swig-pl:
> >- cd $(svn_builddir)&& make check-swig-pl
> >+ cd $(svn_builddir)&& \
> >+ env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) make check-swig-pl
>
> I don't think you need the "env" here, isn't using
> LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) sufficient, since our Makefile's
> use Bourne shell by default.
It possibly is. I'm using env in a couple of other places in this
file though. I don't think it hurts.
Note that this isn't hooked up to our standard makefiles at all.
It's just a wrapper that fetches dependencies, builds svn, can
run multi-way tests and some other things. It may be worth lifting
some functionality from it into our standard Makefile eventually.
Basically I use it to build my own development builds, that's all.
Thanks,
Stefan
Re: svn commit: r946475 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Posted by Blair Zajac <bl...@orcaware.com>.
On 05/19/2010 03:58 PM, stsp@apache.org wrote:
> Author: stsp
> Date: Wed May 19 22:58:37 2010
> New Revision: 946475
>
> URL: http://svn.apache.org/viewvc?rev=946475&view=rev
> Log:
> * tools/dev/unix-build/Makefile.svn: Fix a comment typo. Set LD_LIBRARY_PATH
> when running tests for perl and python bindings.
>
> svn-check-swig-pl:
> - cd $(svn_builddir)&& make check-swig-pl
> + cd $(svn_builddir)&& \
> + env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) make check-swig-pl
I don't think you need the "env" here, isn't using
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) sufficient, since our Makefile's use
Bourne shell by default.
Regards,
Blair