On 10/4/2006 7:35 AM, Williams, Gerald S (Jerry) wrote:
Has anybody successfully built subversion 1.4 (or alternately, is a release planned soon)? It didn't build OOTB for me, and I'd rather not duplicate effort.
I successfully built it with the attached patch. I haven't actually used it yet, since some other tools I use don't yet support 1.4, but it passed all tests except the ruby tests. I did some investigation and it seemed like a problem with the test infrastructure. Since I don't use ruby bindings, I didn't spend a lot of time on it. I did have trouble building with subversion installed. I had to uninstall it to get the build to work correctly. Also, I did not regenerate the swig bindings, as was done for 1.3.2. Anyway, I've attached the g-b-s script and patch I used. Maybe it will work for you. -- David Rothenberger spammer? -> [EMAIL PROTECTED] GPG/PGP: 0x92D68FD8, DB7C 5146 1AB0 483A 9D27 DFBA FBB9 E328 92D6 8FD8 One possible reason that things aren't going according to plan is that there never was a plan in the first place.
--- subversion-1.4.0-orig/CYGWIN-PATCHES/README 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/README 2006-09-12 11:05:09.000000000 -0700 @@ -0,0 +1,54 @@ +Subversion 1.4.0 +------------------------------------------ +The goal of the Subversion project is to build a version control system +that is a compelling replacement for CVS in the open source community. + +There is very useful and comprehensive documentation in the book +"Version Control with Subversion", available free online: + + http://svnbook.red-bean.com/ + + + +Runtime requirements: + cygwin + libapr0 + libaprutil0 + libdb4.2 + expat + libneon24 + +Build requirements: + (basic development packages) + python + autoconf + libtool + apr + apr-util + libdb4.2-devel + neon + libiconv + swig + apache2-devel + perl + +Canonical homepage: + http://subversion.tigris.org/ + +Canonical download: + http://subversion.tigris.org/tarballs/subversion-1.4.0.tar.bz2 + +------------------------------------ + +Build instructions: + unpack subversion-1.4.0-1-src.tar.bz2 + if you use setup to install this src package, it will be + unpacked under /usr/src automatically + cd /usr/src + ./subversion-1.4.0-1.sh all + +Or use './subversion-1.4.0-1.sh prep' to get a patched source directory + +------------------------------------------- + +Cygwin port maintained by: Max Bowsher <[EMAIL PROTECTED]> --- subversion-1.4.0-orig/CYGWIN-PATCHES/gbs.munge 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/gbs.munge 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,46 @@ +ConfigureArg --enable-shared +ConfigureArg --disable-static +ConfigureArg --with-apr=/usr/bin/apr-1-config +ConfigureArg --with-apr-util=/usr/bin/apu-1-config +ConfigureArg --with-neon=/usr +ConfigureArg --disable-neon-version-check +ConfigureArg --with-swig=/usr/bin/swig +ConfigureArg --with-apxs=/usr/sbin/apxs2 + +SubPackage subversion-devel-$VER-$REL.tar.bz2 usr/include usr/lib/libsvn_[a-rt-z]* usr/lib/libsvn_subr* +SubPackage subversion-python-$VER-$REL.tar.bz2 usr/lib/python* usr/bin/cygsvn_swig_py* usr/lib/libsvn_swig_py* +SubPackage subversion-perl-$VER-$REL.tar.bz2 usr/lib/perl5 usr/bin/cygsvn_swig_perl* usr/lib/libsvn_swig_perl* +SubPackage subversion-ruby-$VER-$REL.tar.bz2 usr/lib/ruby usr/bin/cygsvn_swig_ruby* usr/lib/libsvn_swig_ruby* +SubPackage subversion-apache2-$VER-$REL.tar.bz2 usr/lib/apache2 + +AutoreconfCmd ./autogen.sh +AutoreconfCmd find . -name "autom4te.cache" | xargs rm -rf +AutoreconfCmd sed -e 's/relink_command=\\"$relink_command\\""/"/' ac-helpers/ltmain.sh > gbs.$$.tmp && mv gbs.$$.tmp ac-helpers/ltmain.sh + +MakeTarget extraclean-swig-py EXTRA_CFLAGS= +MakeTarget extraclean-swig-pl EXTRA_CFLAGS= +MakeTarget extraclean-swig-rb EXTRA_CFLAGS= +MakeTarget autogen-swig-py EXTRA_CFLAGS= +MakeTarget autogen-swig-pl EXTRA_CFLAGS= +MakeTarget autogen-swig-rb EXTRA_CFLAGS= +MakeTarget EXTRA_CFLAGS= +MakeTarget swig-py swig_pydir=/usr/lib/python2.4/site-packages/libsvn swig_pydir_extra=/usr/lib/python2.4/site-packages/svn EXTRA_CFLAGS= +MakeTarget swig-pl EXTRA_CFLAGS= +MakeTarget swig-rb LIBS=-lruby EXTRA_CFLAGS= + +MakeInstallTarget install +MakeInstallTarget install-swig-py swig_pydir=/usr/lib/python2.4/site-packages/libsvn swig_pydir_extra=/usr/lib/python2.4/site-packages/svn +MakeInstallTarget install-swig-pl +MakeInstallTarget install-swig-rb + +# Kill perllocal.pod and containing dirs +InstallExtraCmd rm ${instdir}/usr/lib/perl5/5.8/cygwin/perllocal.pod +InstallExtraCmd rmdir ${instdir}/usr/lib/perl5/5.8/cygwin +InstallExtraCmd rmdir ${instdir}/usr/lib/perl5/5.8 + +UnpackExclude */apr +UnpackExclude */apr-util +UnpackExclude */neon + +DiffExclude configure +DiffExclude build-outputs.mk --- subversion-1.4.0-orig/CYGWIN-PATCHES/setup.hint 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/setup.hint 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,5 @@ +sdesc: "A version control system" +ldesc: "Subversion is a version control system that aims to be a compelling +replacement for CVS in the open source community" +category: Devel +requires: cygwin libaprutil1 libapr1 libdb4.2 libneon25 expat libintl3 --- subversion-1.4.0-orig/CYGWIN-PATCHES/setup.hint-subversion-apache2 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/setup.hint-subversion-apache2 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,6 @@ +sdesc: "A version control system (Apache 2 modules)" +ldesc: "Subversion is a version control system that aims to be a compelling +replacement for CVS in the open source community" +category: Net Web Devel +requires: subversion apache2 +external-source: subversion --- subversion-1.4.0-orig/CYGWIN-PATCHES/setup.hint-subversion-devel 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/setup.hint-subversion-devel 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,6 @@ +sdesc: "A version control system (C headers and import libraries)" +ldesc: "Subversion is a version control system that aims to be a compelling +replacement for CVS in the open source community" +category: Devel +requires: subversion +external-source: subversion --- subversion-1.4.0-orig/CYGWIN-PATCHES/setup.hint-subversion-perl 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/setup.hint-subversion-perl 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,6 @@ +sdesc: "A version control system (perl bindings)" +ldesc: "Subversion is a version control system that aims to be a compelling +replacement for CVS in the open source community" +category: Devel Libs +requires: subversion perl +external-source: subversion --- subversion-1.4.0-orig/CYGWIN-PATCHES/setup.hint-subversion-python 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/setup.hint-subversion-python 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,6 @@ +sdesc: "A version control system (python bindings)" +ldesc: "Subversion is a version control system that aims to be a compelling +replacement for CVS in the open source community" +category: Devel Libs +requires: subversion python +external-source: subversion --- subversion-1.4.0-orig/CYGWIN-PATCHES/setup.hint-subversion-ruby 1969-12-31 16:00:00.000000000 -0800 +++ subversion-1.4.0/CYGWIN-PATCHES/setup.hint-subversion-ruby 2006-09-12 10:58:32.000000000 -0700 @@ -0,0 +1,6 @@ +sdesc: "A version control system (ruby bindings)" +ldesc: "Subversion is a version control system that aims to be a compelling +replacement for CVS in the open source community" +category: Devel Libs +requires: subversion ruby +external-source: subversion --- subversion-1.4.0-orig/build.conf 2006-08-04 07:49:08.000000000 -0700 +++ subversion-1.4.0/build.conf 2006-09-12 10:58:32.000000000 -0700 @@ -292,6 +292,7 @@ type = apache-mod path = subversion/mod_dav_svn libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr + mod_dav httpd aprutil apr nonlibs = apr aprutil install = apache-mod msvc-libs = mod_dav.lib libhttpd.lib @@ -302,9 +303,20 @@ path = subversion/mod_authz_svn nonlibs = mod_dav_svn apr aprutil libs = libsvn_subr libsvn_repos + mod_dav_svn httpd aprutil apr install = apache-mod msvc-libs = libhttpd.lib +[mod_dav] +type = lib +external-lib = `$(APXS) -q libexecdir`/mod_dav.la +libs = httpd aprutil apr + +[httpd] +type = lib +external-lib = `$(APXS) -q libdir`/libhttpd2core.la +libs = aprutil apr + [svnserve] description = Subversion Server type = exe @@ -427,12 +439,16 @@ type = swig_lib lang = perl path = subversion/bindings/swig/perl/libsvn_swig_perl -libs = libsvn_subr libsvn_delta aprutil apriconv apr +libs = libsvn_subr libsvn_delta aprutil apriconv apr perl install = swig-pl-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_PL) msvc-static = yes +[perl] +type = lib +external-lib = -L/usr/lib/perl5/5.8/cygwin/CORE -lperl + # SWIG utility library for Ruby modules [libsvn_swig_ruby] type = swig_lib --- subversion-1.4.0-orig/configure.in 2006-07-13 06:48:48.000000000 -0700 +++ subversion-1.4.0/configure.in 2006-09-12 10:58:32.000000000 -0700 @@ -359,10 +359,10 @@ INSTALL_STATIC_RULES="install-bin install-docs" INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static" INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE" -BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE" +BUILD_RULES="fsmod-lib ramod-lib lib bin $BUILD_APACHE_RULE" if test "$svn_lib_berkeley_db" = "yes"; then - BUILD_RULES="$BUILD_RULES bdb-lib bdb-test" + BUILD_RULES="$BUILD_RULES bdb-lib" INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`" INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib" BDB_TEST_DEPS="\$(BDB_TEST_DEPS)" --- subversion-1.4.0-orig/subversion/svnadmin/main.c 2006-08-23 06:37:25.000000000 -0700 +++ subversion-1.4.0/subversion/svnadmin/main.c 2006-09-12 11:03:12.000000000 -0700 @@ -37,6 +37,10 @@ #include "svn_private_config.h" +#include <unistd.h> +#include <io.h> +#include <fcntl.h> + /*** Code. ***/ @@ -630,6 +634,7 @@ /* Run the dump to STDOUT. Let the user redirect output into a file if they want. :-) */ + setmode(STDOUT_FILENO, O_BINARY); SVN_ERR(create_stdio_stream(&stdout_stream, apr_file_open_stdout, pool)); /* Progress feedback goes to STDERR, unless they asked to suppress it. */ @@ -686,6 +691,7 @@ SVN_ERR(open_repos(&repos, opt_state->repository_path, pool)); /* Read the stream from STDIN. Users can redirect a file. */ + setmode(STDIN_FILENO, O_BINARY); SVN_ERR(create_stdio_stream(&stdin_stream, apr_file_open_stdin, pool));
subversion-1.4.0-0.sh.gz
Description: application/gzip
signature.asc
Description: OpenPGP digital signature
