This is the mail archive of the cygwin mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] subversion-1.5.3 source: add aprutil lib to target


I'm referring to the latest subversion-1.5.3 source file.

Looking at build.conf, the subversion/libsvn_fs/libsvn_fs-1.la target
in build-outputs.mk should have the $(SVN_APRUTIL_LIBS) path for the
linker, but it doesn't. applying the below patch fixes this. (although
running gen-make.py could re-generate build-outputs.mk, i'm not sure
what parameters were used to generate the original, so imo one should
just make that one modification)

(libsvn_fs uses aprutil, without this modification the build process fails.)

--- origsrc/subversion-1.5.3/build-outputs.mk	2008-10-19
00:46:33.234375000 +0800
+++ src/subversion-1.5.3/build-outputs.mk	2008-10-19 00:46:41.265625000 +0800
@@ -208,7 +208,7 @@
 libsvn_fs_DEPS = $(SVN_FS_LIB_DEPS) subversion/libsvn_fs/access.lo
subversion/libsvn_fs/fs-loader.lo
subversion/libsvn_subr/libsvn_subr-1.la
 libsvn_fs_OBJECTS = access.lo fs-loader.lo
 subversion/libsvn_fs/libsvn_fs-1.la: $(libsvn_fs_DEPS)
-	cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la
$(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS)
../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_FS_LIB_LINK)
$(SVN_APR_LIBS) $(LIBS)
+	cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la
$(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS)
../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_FS_LIB_LINK)
$(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) $(LIBS)

 libsvn_fs_base_PATH = subversion/libsvn_fs_base
 libsvn_fs_base_DEPS =  subversion/libsvn_fs_base/bdb/bdb-err.lo
subversion/libsvn_fs_base/bdb/bdb_compat.lo
subversion/libsvn_fs_base/bdb/changes-table.lo
subversion/libsvn_fs_base/bdb/copies-table.lo
subversion/libsvn_fs_base/bdb/dbt.lo
subversion/libsvn_fs_base/bdb/env.lo
subversion/libsvn_fs_base/bdb/lock-tokens-table.lo
subversion/libsvn_fs_base/bdb/locks-table.lo
subversion/libsvn_fs_base/bdb/node-origins-table.lo
subversion/libsvn_fs_base/bdb/nodes-table.lo
subversion/libsvn_fs_base/bdb/reps-table.lo
subversion/libsvn_fs_base/bdb/rev-table.lo
subversion/libsvn_fs_base/bdb/strings-table.lo
subversion/libsvn_fs_base/bdb/txn-table.lo
subversion/libsvn_fs_base/bdb/uuids-table.lo
subversion/libsvn_fs_base/dag.lo subversion/libsvn_fs_base/err.lo
subversion/libsvn_fs_base/fs.lo subversion/libsvn_fs_base/id.lo
subversion/libsvn_fs_base/key-gen.lo subversion/libsvn_fs_base/lock.lo
subversion/libsvn_fs_base/node-rev.lo
subversion/libsvn_fs_base/reps-strings.lo
subversion/libsvn_fs_base/revs-txns.lo
subversion/libsvn_fs_base/trail.lo subversion/libsvn_fs_base/tree.lo
subversion/libsvn_fs_base/util/fs_skels.lo
subversion/libsvn_fs_base/util/skel.lo
subversion/libsvn_fs_base/uuid.lo
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
subversion/libsvn_fs_util/libsvn_fs_util-1.la

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]