Edward S. Marshall wrote:
>On Tue, 2002-10-29 at 22:18, Ben Collins-Sussman wrote:
>
>
>>I don't think the answer is to simply put 'std' first in the list
>>again, but rather to fix the logic further down. If 'std' is first in
>>the list, then everything breaks on FreeBSD. As the comment says, we
>>end up finding /usr/include/db.h, which is db2, and pairing it with
>>/usr/local/lib/libdb.so, which is newer.
>>
>>
>
>We were talking about this on IRC last night, and I noticed the
>following little buglet which might account for at least a few problems.
>Patch attached.
>
Well! I knew I was prone to typos, but this one was a real beauty.
Thanks, Edward; committed in revision 3570.
Ben: There's no sane way to stop the compiler and linker from looking
into the "standard" places; so, indeed, it's best if "std" is the first
place searched. _however_, the test program should be smarter -- it
should check that the compile-time BDB version, declared in the header,
is the same as the run-time one, found by db_version(). The test should
be similar to the one in svn_bdb__check_version in
subversion/libsvn_fs/bdb/bdb_compat.c, except that the patch number must
be verified, too.
If you add that test to the one that's already in berkeley-db.m4, it'll
catch the FreeBSD weirdness, and you can safely move "std" to the
beginning of the list.
Now, that list has another problem. It only contains
/usr/local/BerkeleyDB.4.0 (remember that the version passed into
SVN_LIB_BERKELEY_DB is the _minimum_, not the _exact_ version
suppoerted), so we'll never find BDB 4.1 (without --with-berkeley-db) if
it happens to be installed in /usr/local/BerkeleyDB.4.1. It also looks
like we can't use an in-tree copy of BDB 4.1. Right now I'm not
particularly worried about that, but it's something we should keep in mind.
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 30 07:46:32 2002