Re: [Issue 511] svn patch

[Erik Huelsmann <eh...@gmail.com>]

On 12 Oct 2005 08:17:53 -0000, madanus@tigris.org <ma...@tigris.org> wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=511
>
> ------- Additional comments from madanus@tigris.org Wed Oct 12 01:17:53 -0700 2005 -------
> Where can I find Mo DeJong's framework for 'svn patch' pl? I searched the
> mailing list archives for 'Mo DeJong' without any success... :(
>

Development of a tool called svnpatch has concentrated here:
http://svn.red-bean.com/repos/sussman/software/svnpatch/

bye,

Erik.

Re: [Issue 511] svn patch

[Erik Huelsmann <eh...@gmail.com>]

On 10/12/05, Julian Foad <ju...@btopenworld.com> wrote:
> Erik Huelsmann wrote:
> >
> > Development of a tool called svnpatch has concentrated here:
> > http://svn.red-bean.com/repos/sussman/software/svnpatch/
>
> Can you give me a clue how to build it?
>
> So far I have modified "Makefile" to point to my current Subversion and APR
> development directories (for include files and libs), and copied the compiler
> flag "_LARGEFILE64_SOURCE" from my Subversion build just because experimentally
> it made the build go much further (yuck!).

I'd love to, but what's in the Makefile reflects the joint knowledge
wrt buildsystems of sussman and me... (which isn't much)


I hope someone can pitch in here and help with the build system?
Possibly converting it to autoconf, or some other tool which helps
cross platform building.

Re: [Issue 511] svn patch

[Julian Foad <ju...@btopenworld.com>]

Erik Huelsmann wrote:
> 
> Development of a tool called svnpatch has concentrated here:
> http://svn.red-bean.com/repos/sussman/software/svnpatch/

Can you give me a clue how to build it?

So far I have modified "Makefile" to point to my current Subversion and APR 
development directories (for include files and libs), and copied the compiler 
flag "_LARGEFILE64_SOURCE" from my Subversion build just because experimentally 
it made the build go much further (yuck!).

> ~/src/svnpatch> svn diff
> Index: Makefile
> ===================================================================
> --- Makefile    (revision 465)
> +++ Makefile    (working copy)
> @@ -1,7 +1,12 @@
> +MY_SRC=/home/julianfoad/src/subversion
> +MY_OBJ=/home/julianfoad/build/subversion
> +SVN_OBJ=$(MY_OBJ)/subversion
> +APR_OBJ=$(MY_OBJ)/apr
> +APU_OBJ=$(MY_OBJ)/apr-util
> 
>  CC=cc
> -CC_OPTS=-g -O2
> -INCLUDES=-Ilibsvn_delta -I/usr/local/include/subversion-1 -I/usr/local/apr/include/apr-0
> +CC_OPTS=-g -O2 -D_LARGEFILE64_SOURCE
> +INCLUDES=-Ilibsvn_delta -I$(MY_SRC)/subversion/include -I$(SVN_OBJ) -I$(MY_SRC)/apr/include -I$(APR_OBJ)/include -I$(MY_SRC)/apr-util/include -I$(APU_OBJ)/include
> 
>  .SUFFIXES: .c .o
> 
> @@ -19,7 +24,7 @@
>  SVNPATCH_DEPS = main.o libsvn_delta.a
> 
>  svnpatch: $(SVNPATCH_DEPS)
> -       $(CC) $(CC_OPTS) $(INCLUDES) -o svnpatch main.o libsvn_delta.a -L/usr/local/apr/lib -L/usr/local/lib -lsvn_wc-1 -lsvn_subr-1 -lapr-0 -laprutil-0
> +       $(CC) $(CC_OPTS) $(INCLUDES) -o svnpatch main.o libsvn_delta.a -L$(APR_OBJ)/.libs -L$(APU_OBJ)/.libs $(SVN_OBJ)/libsvn_wc/.libs/libsvn_wc-1.a $(SVN_OBJ)/libsvn_subr/.libs/libsvn_subr-1.a -lapr-1 -laprutil-1


"make svnpatch" proceeds cleanly up to the final link where it fails with 
several undefined references:

main.o:
   svn_delta_version

libsvn_wc:
   svn_txdelta
   svn_txdelta_apply
   svn_txdelta_send_txstream
   svn_diff_file_diff3
   svn_diff_file_output_merge
   svn_diff_contains_conflicts
   svn_delta_get_cancellation_editor


- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org