On Wed, May 14, 2014 at 03:35:50AM +0000, Daniel Shahaf wrote: > James McCoy wrote on Tue, May 13, 2014 at 22:00:55 -0400: > > I had tried the below patch but ran into some other issues that I didn't > > have the time/experience to properly diagnose. > > There was no attachment.
Attached. Thanks, -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
Index: 1.8.x/Makefile.in
===================================================================
--- 1.8.x/Makefile.in (revision 1594444)
+++ 1.8.x/Makefile.in (working copy)
@@ -202,16 +202,18 @@
# export an env variable so that the tests can run without being installed
TEST_SHLIB_VAR_JAVAHL=\
- if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
- for d in $(abs_builddir)/subversion/libsvn_*; do \
- if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
- @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
- else \
- @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
- fi; \
- done; \
- export @SVN_APR_SHLIB_PATH_VAR@; \
- fi;
+ case "@SVN_APR_SHLIB_PATH_VAR@" in \
+ DYLD_LIBRARY_PATH|LD_LIBRARY_PATH) \
+ for d in $(abs_builddir)/subversion/libsvn_*; do \
+ if [ -n "$$@SVN_APR_SHLIB_PATH_VAR@" ]; then \
+ @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+ else \
+ @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+ fi; \
+ done; \
+ export @SVN_APR_SHLIB_PATH_VAR@; \
+ ;; \
+ esac;
# special compilation for files destined for cxxhl
COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
@@ -302,16 +304,18 @@
# export an env variable so that the tests can run without being installed
TEST_SHLIB_VAR_SWIG_PY=\
- if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
- for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
- if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
- @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
- else \
- @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
- fi; \
- done; \
- export @SVN_APR_SHLIB_PATH_VAR@; \
- fi;
+ case "@SVN_APR_SHLIB_PATH_VAR@" in \
+ DYLD_LIBRARY_PATH|LD_LIBRARY_PATH) \
+ for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
+ if [ -n "$$@SVN_APR_SHLIB_PATH_VAR@" ]; then \
+ @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+ else \
+ @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+ fi; \
+ done; \
+ export @SVN_APR_SHLIB_PATH_VAR@; \
+ ;; \
+ esac;
# The path to generated and complementary source files for the SWIG
# bindings.
@@ -345,16 +349,18 @@
# export an env variable so that the tests can run without being installed
TEST_SHLIB_VAR_SWIG_RB=\
- if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
- for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
- if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
- @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
- else \
- @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
- fi; \
- done; \
- export @SVN_APR_SHLIB_PATH_VAR@; \
- fi;
+ case "@SVN_APR_SHLIB_PATH_VAR@" in \
+ DYLD_LIBRARY_PATH|LD_LIBRARY_PATH) \
+ for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
+ if [ -n "$$@SVN_APR_SHLIB_PATH_VAR@" ]; then \
+ @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+ else \
+ @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+ fi; \
+ done; \
+ export @SVN_APR_SHLIB_PATH_VAR@; \
+ ;; \
+ esac;
APXS = @APXS@
Index: 1.8.x/build/ac-macros/swig.m4
===================================================================
--- 1.8.x/build/ac-macros/swig.m4 (revision 1594444)
+++ 1.8.x/build/ac-macros/swig.m4 (working copy)
@@ -185,7 +185,7 @@
rbconfig="$RUBY -rrbconfig -e "
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
- rubyhdrdir sitedir sitelibdir sitearchdir libdir
+ rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir libdir
do
rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
eval "rbconfig_$var_name=\"$rbconfig_tmp\""
@@ -196,7 +196,13 @@
AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
if test -d "$rbconfig_rubyhdrdir"; then
dnl Ruby >=1.9
- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward -I$rbconfig_rubyhdrdir/$rbconfig_arch"
+ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir -I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+ if test -d "$rbconfig_rubyarchhdrdir"; then
+ dnl Ruby >=2.0
+ svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
+ else
+ svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyhdrdir/$rbconfig_arch"
+ fi
else
dnl Ruby 1.8
svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
Index: 1.8.x/configure.ac
===================================================================
--- 1.8.x/configure.ac (revision 1594444)
+++ 1.8.x/configure.ac (working copy)
@@ -1246,7 +1246,7 @@
if test -n "$RUBY"; then
AC_PATH_PROG(RUBY, "$RUBY", none)
else
- AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193, none)
+ AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193, ruby2.0, none)
fi
if test "$RUBY" != "none"; then
AC_MSG_CHECKING([rb_hash_foreach])
@@ -1255,7 +1255,7 @@
if test -n "$RDOC"; then
AC_PATH_PROG(RDOC, "$RDOC", none)
else
- AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193, none)
+ AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193, rdoc2.0, none)
fi
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
signature.asc
Description: Digital signature
