diff -r c042db93c4a6 -r c1e0ab04f363 components/ruby/Makefile --- a/components/ruby/Makefile Mon Aug 05 23:04:24 2013 +0200 +++ b/components/ruby/Makefile Tue Aug 06 17:33:28 2013 -0700 @@ -20,19 +20,19 @@ # # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= ruby COMPONENT_VERSION= 1.8.7 -COMPONENT_PATCH_VERSION= 374 +COMPONENT_PATCH_VERSION= 357 COMPONENT_PROJECT_URL= http://www.ruby-lang.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-p$(COMPONENT_PATCH_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ - sha256:b4e34703137f7bfb8761c4ea474f7438d6ccf440b3d35f39cc5e4d4e239c07e3 + sha256:5c64b63a597b4cb545887364e1fd1e0601a7aeb545e576e74a6d8e88a2765a37 COMPONENT_ARCHIVE_URL= http://ftp.ruby-lang.org/pub/ruby/1.8/$(COMPONENT_ARCHIVE) IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION) @@ -118,15 +118,6 @@ # unreferenced symbol tgetent in libreadline, similar to CR #6919344 LD_Z_IGNORE= -# Several of the drb tests will leave stray ruby processes behind; -# move these tests aside so they won't be run by the test target. -# They aren't needed by the build or packages, so we keep them -# renamed. -COMPONENT_PRE_TEST_ACTION += \ - if [ -e $(SOURCE_DIR)/test/drb/test_drbssl.rb ]; then \ - $(MV) $(SOURCE_DIR)/test/drb/test_drbssl.rb $(SOURCE_DIR)/test/drb/test_drbssl.rb-save; \ - fi - CONFIGURE_PREFIX = $(USRDIR)/$(COMPONENT_NAME)/$(RUBY_VER) CONFIGURE_OPTIONS += $(DTRACE_FLAG) CONFIGURE_OPTIONS += --enable-shared