[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Is fs_loader.c a mistake?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2004-04-30 04:02:58 CEST

Philip Martin <philip@codematters.co.uk> writes:

> "make install" fails because it attempts to install libsvn_fs before
> libsvn_fs_fs (I guess you may not see this if you are installing over
> an existing installation that already provides libsvn_fs_fs). Looking
> in build-outputs.mk I see that the install-lib target lists libsvn_fs
> before libsvn_fs_fs, I haven't yet worked out how to fix that.

The following patch allows me to install my normal build. I'm
guessing it's not correct as it hardcodes stuff that I think is
supposed to be optional. "make install" is currently broken unless
one is installing over an existing installation that provides
libraries sufficient to link :-(

Index: build.conf
===================================================================
--- build.conf (revision 9573)
+++ build.conf (working copy)
@@ -142,7 +142,7 @@
 path = subversion/libsvn_fs
 sources = *.c
 install = lib
-libs = libsvn_subr fs-libs apr
+libs = libsvn_subr libsvn_fs_fs fs-libs apr
 # conditionally add more dependencies
 add-deps = $(SVN_FS_LIB_DEPS)
 msvc-static = yes
@@ -167,7 +167,7 @@
 [libsvn_ra]
 type = lib
 path = subversion/libsvn_ra
-libs = libsvn_subr ra-libs aprutil apriconv apr
+libs = libsvn_subr libsvn_ra_local ra-libs aprutil apriconv apr
 # conditionally add more dependencies
 add-deps = $(SVN_RA_LIB_DEPS)
 install = lib

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 30 04:03:26 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.