Den fre 24 juni 2022 kl 21:15 skrev Nathan Hartman <hartman.nat...@gmail.com
>:

> If so, I don't currently have a (convenient) setup to experiment with
> this at the moment; are you able to just hack your hypothetical fix
> into your SVN makefile, i.e., `install-bdb-lib : install-fsmod-lib`,
> and run make with shuffle=1656015674 and tell us if that appears to
> fix it? Then I can go digging to see where to add it correctly.
>

Reproduction, without --shuffle, running on Ubuntu 21.10 (under WSL, with
all available updates):

$ make distclean
$ ./autogen.sh
# Obviously, replace --prefix with something usable on your system!
$ ./configure --with-berkeley-db --prefix=/home/dsg/4901
$ make install-bdb-lib
# Output:
# /usr/bin/install -c -d /home/dsg/4901/lib /home/dsg/4901/share/pkgconfig
# cd subversion/libsvn_fs_base ; /bin/bash "/home/dsg/svn_4901/libtool"
--mode=install /usr/bin/install -c libsvn_fs_base-1.la /home/dsg/4901/lib/
libsvn_fs_base-1.la
# libtool: warning: relinking 'libsvn_fs_base-1.la'
# libtool: install: (cd /home/dsg/svn_4901/subversion/libsvn_fs_base;
/bin/bash "/home/dsg/svn_4901/libtool"  --tag CC --silent --mode=relink gcc
-g -O2 -rpath /home/dsg/4901/lib -version-info 0 -Wl,--no-undefined -o
libsvn_fs_base-1.la bdb/bdb-err.lo bdb/bdb_compat.lo bdb/changes-table.lo
bdb/checksum-reps-table.lo bdb/copies-table.lo bdb/dbt.lo bdb/env.lo
bdb/lock-tokens-table.lo bdb/locks-table.lo bdb/miscellaneous-table.lo
bdb/node-origins-table.lo bdb/nodes-table.lo bdb/reps-table.lo
bdb/rev-table.lo bdb/strings-table.lo bdb/txn-table.lo bdb/uuids-table.lo
dag.lo err.lo fs.lo id.lo key-gen.lo lock.lo node-rev.lo reps-strings.lo
revs-txns.lo trail.lo tree.lo util/fs_skels.lo uuid.lo
../../subversion/libsvn_delta/libsvn_delta-1.la
../../subversion/libsvn_subr/libsvn_subr-1.la -L/usr/lib/x86_64-linux-gnu
-laprutil-1 -L/usr/lib/x86_64-linux-gnu -lapr-1 -ldb-5.3
../../subversion/libsvn_fs_util/libsvn_fs_util-1.la )
# /usr/bin/ld: cannot find -lsvn_fs_util-1
# collect2: error: ld returned 1 exit status
# libtool:   error: error: relink 'libsvn_fs_base-1.la' with the above
command before installing it
# make: *** [build-outputs.mk:1422: install-bdb-lib] Error 1

# Fix; run install-fsmod-lib first:
$ make install-fsmod-lib
$ make install-bdb-lib
# Installs correctly

The following change to build.conf seems to fix it by adding an install
dependency (similar to the ones already existing):
[[[
Index: build.conf
===================================================================
--- build.conf  (revision 1902243)
+++ build.conf  (working copy)
@@ -288,6 +288,7 @@
 sources = *.c bdb/*.c util/*.c
 install = bdb-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util
+add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
 msvc-export = ../libsvn_fs_base/fs_init.h
 msvc-delayload = yes
]]]

I must admit I'm not really sure I understand the build system, so I'm not
committing this myself without review.

Kind regards,
Daniel

Reply via email to