subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1781551 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Fri, 03 Feb 2017 14:15:24 GMT
Author: stsp
Date: Fri Feb  3 14:15:23 2017
New Revision: 1781551

URL: http://svn.apache.org/viewvc?rev=1781551&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Update ruby to 2.1.10 (long overdue...)

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1781551&r1=1781550&r2=1781551&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Feb  3 14:15:23 2017
@@ -48,6 +48,22 @@ RAMDISK ?= /ramdisk
 
 PWD		= $(shell pwd)
 UNAME		= $(shell uname)
+RUBY		= $(shell which ruby 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY		= $(shell which ruby22 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY		= $(shell which ruby21 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY		= $(shell which ruby20 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY		= $(shell which ruby19 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY		= $(shell which ruby18)
+endif # 1.8
+endif # 1.9
+endif # 2.0
+endif # 2.1
+endif # 2.2
 
 TAG		?= none
 ifeq ($(TAG),none)
@@ -79,7 +95,7 @@ SERF_OLD_VER	= 0.3.1
 CYRUS_SASL_VER	= 2.1.25
 SQLITE_VER	= 3160200
 LIBMAGIC_VER	= 5.28
-RUBY_VER	= 1.8.7-p374
+RUBY_VER	= 2.1.10
 BZ2_VER	= 1.0.6
 PYTHON_VER	= 2.7.8
 JUNIT_VER	= 4.10
@@ -107,7 +123,7 @@ SHA256_${NEON_DIST} = db0bd8cdec329b48f5
 SHA256_${CYRUS_SASL_DIST} = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
 SHA256_${SQLITE_DIST} = 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
 SHA256_${LIBMAGIC_DIST} = 0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012
-SHA256_${RUBY_DIST} = 876eeeaaeeab10cbf4767833547d66d86d6717ef48fd3d89e27db8926a65276c
+SHA256_${RUBY_DIST} = fb2e454d7a5e5a39eb54db0ec666f53eeb6edc593d1d2b970ae4d150b831dd20
 SHA256_${BZ2_DIST} = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 SHA256_${PYTHON_DIST} = 74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557
 SHA256_${JUNIT_DIST} = 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
@@ -155,7 +171,7 @@ SERF_OLD_URL	= https://svn.apache.org/re
 SQLITE_URL	= https://www.sqlite.org/2017/$(SQLITE_DIST)
 CYRUS_SASL_URL	= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$(CYRUS_SASL_DIST)
 LIBMAGIC_URL	= ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
-RUBY_URL	= https://cache.ruby-lang.org/pub/ruby/1.8/$(RUBY_DIST)
+RUBY_URL	= https://cache.ruby-lang.org/pub/ruby/2.1/$(RUBY_DIST)
 BZ2_URL		= http://bzip.org/$(BZ2_VER)/$(BZ2_DIST)
 PYTHON_URL	= https://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST)
 JUNIT_URL	= https://downloads.sourceforge.net/project/junit/junit/$(JUNIT_VER)/$(JUNIT_DIST)
@@ -1087,11 +1103,6 @@ $(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(
 	$(call do_check_sha256,$(RUBY_DIST))
 	[ -d $(RUBY_OBJDIR) ] || mkdir -p $(RUBY_OBJDIR)
 	tar -C $(SRCDIR) -zxf $(DISTDIR)/$(RUBY_DIST)
-	grep -v 'OSSL_SSL_METHOD_ENTRY(SSLv3' \
-		$(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c > \
-		$(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c.nossl3
-	mv $(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c.nossl3 \
-		$(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c
 	touch $@
 
 ifeq ($(THREADING),yes)
@@ -1107,7 +1118,11 @@ $(RUBY_OBJDIR)/.configured: $(RUBY_OBJDI
 		$(RUBY_SRCDIR)/configure \
 		--prefix=$(PREFIX)/ruby \
 		--enable-shared \
-		$(THREADSAFE_FLAG)
+		--with-baseruby="$(RUBY)" \
+		$(THREADSAFE_FLAG) \
+		--disable-install-doc \
+		--without-valgrind \
+		--without-gmp
 	touch $@
 
 # compile ruby



Mime
View raw message