On Tue, 2012-06-26 at 12:08 -0700, David Rothenberger wrote: > On 6/26/2012 11:07 AM, Achim Gratz wrote: > > I've had to comment out the Apache module build since the mod_dav.la > > was nowhere to be found and no Cygwin package provides it. > > Achim is referring to rebuilding Subversion. I just tried this and ran > into the same problem. apache2-2.2.22-2 provided > /usr/lib/apache2/mod_dav.la but this is no longer included in 2.2.22-3. > > Yaakov, can you make a new apache2 package with the .la file? This is > required to get the Apache Subversion module to compile.
Not really, it's just a matter of adjusting your patches. In 02-fix-linking.patch, change the [mod_dav] external-lib line to: +external-lib = -Wl,`$(APXS) -q libexecdir`/mod_dav.so and the [httpd] external-lib line to: +external-lib = -lhttpd2core While I'm at it, would you consider adding GNOME Keyring support to subversion? The additional build requirements are minimal (libgnome-keyring-devel and libdbus1-devel) and require the following changes: * add the attached patch; * add --with-gnome-keyring to CYGCONF_ARGS; * add subversion-gnome to PKG_NAMES, --exclude=cygsvn_auth_*.dll to subversion_CONTENTS, and define subversion_gnome_CONTENTS="usr/bin/cygsvn_auth_gnome_keyring*.dll"; * add subversion-gnome.hint with requires: libapr1 libdbus1_3 libglib2.0_0 libgnome-keyring0 libintl8 subversion TIA, Yaakov
--- origsrc/subversion/subversion/libsvn_fs/fs-loader.c 2012-03-08 14:38:31.000000000 -0600 +++ src/subversion/subversion/libsvn_fs/fs-loader.c 2012-03-30 18:33:19.743161700 -0500 @@ -100,7 +100,12 @@ load_module(fs_init_func_t *initfunc, co const char *funcname; apr_status_t status; - libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.0", + libname = apr_psprintf(pool, +#ifdef __CYGWIN__ + "cygsvn_fs_%s-%d-0.dll", +#else + "libsvn_fs_%s-%d.so.0", +#endif name, SVN_VER_MAJOR); funcname = apr_psprintf(pool, "svn_fs_%s__init", name); --- origsrc/subversion/subversion/libsvn_ra/ra_loader.c 2012-03-08 14:38:31.000000000 -0600 +++ src/subversion/subversion/libsvn_ra/ra_loader.c 2012-03-30 18:33:56.349255500 -0500 @@ -159,7 +159,12 @@ load_ra_module(svn_ra__init_func_t *func const char *compat_funcname; apr_status_t status; - libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0", + libname = apr_psprintf(pool, +#ifdef __CYGWIN__ + "cygsvn_ra_%s-%d-0.dll", +#else + "libsvn_ra_%s-%d.so.0", +#endif ra_name, SVN_VER_MAJOR); funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name); compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name); --- origsrc/subversion/subversion/libsvn_subr/auth.c 2012-03-08 14:38:31.000000000 -0600 +++ src/subversion/subversion/libsvn_subr/auth.c 2012-03-30 17:58:37.756078900 -0500 @@ -399,7 +399,11 @@ svn_auth_get_platform_specific_provider const char *library_label, *library_name; const char *provider_function_name, *version_function_name; library_name = apr_psprintf(pool, +#ifdef __CYGWIN__ + "cygsvn_auth_%s-%d-0.dll", +#else "libsvn_auth_%s-%d.so.0", +#endif provider_name, SVN_VER_MAJOR); library_label = apr_psprintf(pool, "svn_%s", provider_name);