# HG changeset patch # User April Chin # Date 1399406140 25200 # Node ID 52c374636ef51ea12f948010ee780fc16b264d3f # Parent bf54e704f98e61ba30f888e15a404ab69a59d94c 18685997 subversion build should not use ruby 1.8 diff -r bf54e704f98e -r 52c374636ef5 components/subversion/Makefile --- a/components/subversion/Makefile Tue May 06 13:46:04 2014 -0600 +++ b/components/subversion/Makefile Tue May 06 12:55:40 2014 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk @@ -99,10 +99,6 @@ CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" CONFIGURE_ENV += PERL="$(PERL)" CONFIGURE_ENV += PLMODS="$(PLMODS)" -# Current version of subversion only supports ruby 1.8, not 1.9. -# Until subversion is updated to 1.8.0 (ruby 1.9 support added) -# or later, use ruby 1.8. -CONFIGURE_ENV += RUBY="$(RUBY.1.8)" CONFIGURE_ENV += LD_OPTIONS="$(LD_OPTIONS)" LIBSVNDIR.32 = $(CONFIGURE_PREFIX)/lib/svn