b966f689e9
- update to upstream 1.7.5 - Subversion currently does not compile Ruby bindings for 1.9 disable to fix build in Factory - add subversion-1.7.4-ruby-1.9-RbConfig.patch to use RbConfig instead of Config which is deprecated in Ruby 1.9 (committed to upstream trunk) - fix conditional configuration for serf support - add check that ra_serf is built as configure failed silently - Allow unit tests to be run for Factory: --with=regression_tests replacing the inline conditional OBS-URL: https://build.opensuse.org/request/show/122507 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=94
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
Index: build/ac-macros/swig.m4
|
|
===================================================================
|
|
--- build/ac-macros/swig.m4.orig 2012-05-11 22:37:59.000000000 +0100
|
|
+++ build/ac-macros/swig.m4 2012-05-11 22:38:27.000000000 +0100
|
|
@@ -187,7 +187,7 @@ AC_DEFUN(SVN_FIND_SWIG,
|
|
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
|
|
rubyhdrdir sitedir sitelibdir sitearchdir libdir
|
|
do
|
|
- rbconfig_tmp=`$rbconfig "print Config::CONFIG@<:@'$var_name'@:>@"`
|
|
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
|
|
eval "rbconfig_$var_name=\"$rbconfig_tmp\""
|
|
done
|
|
|
|
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig 2012-05-11 22:37:59.000000000 +0100
|
|
+++ configure.ac 2012-05-11 22:55:02.000000000 +0100
|
|
@@ -1121,12 +1121,12 @@ if test "$RUBY" != "none"; then
|
|
AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
|
|
fi
|
|
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
|
|
- svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
|
|
+ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
|
|
])
|
|
RUBY_MAJOR="$svn_cv_ruby_major"
|
|
|
|
AC_CACHE_CHECK([for Ruby minor version], [svn_cv_ruby_minor],[
|
|
- svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'`"
|
|
+ svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MINOR))'`"
|
|
])
|
|
RUBY_MINOR="$svn_cv_ruby_minor"
|
|
|