Michal Nowak
2020-01-01 1780eb33e220e11f92706e61c035bfc218aea23c
Updare Ruby 2.6 to 2.6.5
5 files modified
76 ■■■■■ changed files
components/ruby/ruby-26/Makefile 34 ●●●● patch | view | raw | blame | history
components/ruby/ruby-26/manifests/sample-manifest.p5m 7 ●●●●● patch | view | raw | blame | history
components/ruby/ruby-26/patches/02-config.patch 26 ●●●● patch | view | raw | blame | history
components/ruby/ruby-26/ruby-26.p5m 7 ●●●●● patch | view | raw | blame | history
components/ruby/ruby-26/test/results-64.master 2 ●●● patch | view | raw | blame | history
components/ruby/ruby-26/Makefile
@@ -21,34 +21,28 @@
#
# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright 2020, Michal Nowak
#
PREFERRED_BITS=    64
BUILD_BITS=        64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        ruby
COMPONENT_VERSION=    2.6.3
COMPONENT_VERSION=    2.6.5
COMPONENT_SUMMARY=    Ruby, RubyGems, and Rake
COMPONENT_PROJECT_URL=    http://www.ruby-lang.org/
COMPONENT_SRC=    \
    $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_URL=    https://cache.ruby-lang.org/pub/ruby/2.6/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH=    \
    sha256:11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1
COMPONENT_FMRI= runtime/ruby-26
    sha256:d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62
COMPONENT_FMRI=        runtime/ruby-26
COMPONENT_CLASSIFICATION= Development/Ruby
COMPONENT_LICENSE=      Ruby License
COMPONENT_LICENSE_FILE= COPYING
COMPONENT_LICENSE=    Ruby License
COMPONENT_LICENSE_FILE=    COPYING
COMPONENT_ARCHIVE_URL=    \
    https://cache.ruby-lang.org/pub/ruby/2.6/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB=    utility/ruby
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/common.mk
# COMPONENT_VERSION <major>.<minor>.<teeny>
# is transformed into <major>.<minor> for RUBY_VER.
@@ -138,14 +132,6 @@
    '-e "/Running tests/p"' \
    '-e "/Finished tests in Xs, X tests\/s, X assertions/p"' \
    '-e "/.* tests, X assertions, .* failures, .* errors, X skips/p"'
# common targets
build:        $(BUILD_64)
install:    $(INSTALL_64)
test:    $(TEST_64)
# Auto-generated dependencies
REQUIRED_PACKAGES += library/database/gdbm
components/ruby/ruby-26/manifests/sample-manifest.p5m
@@ -675,7 +675,6 @@
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/images/zoom.png
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/index.rhtml
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/js/darkfish.js
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/js/jquery.js
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/js/search.js
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/page.rhtml
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/servlet_not_found.rhtml
@@ -1322,8 +1321,8 @@
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rake-12.3.2/lib/rake/version.rb
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rake-12.3.2/lib/rake/win32.rb
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rake-12.3.2/rake.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.0/exe/rdoc
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.0/exe/ri
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.2/exe/rdoc
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.2/exe/ri
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/test-unit-3.2.9/COPYING
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/test-unit-3.2.9/GPL
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/test-unit-3.2.9/LGPL
@@ -1470,7 +1469,7 @@
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/ostruct-0.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/prime-0.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/psych-3.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rdoc-6.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rdoc-6.1.2.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rexml-3.1.9.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rss-0.2.7.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/scanf-1.0.0.gemspec
components/ruby/ruby-26/patches/02-config.patch
@@ -3,9 +3,9 @@
# Changes were developed in-house, are Solaris specific,
# and are not suitable for upstream.
--- ruby-2.5.3/tool/config.guess    2018-10-31 14:32:31.812918029 +0000
+++ ruby-2.5.3/tool/config.guess    2018-10-31 14:32:15.303246783 +0000
@@ -383,25 +383,18 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
--- ruby-2.6.5/tool/config.guess    2019-10-01 13:01:01.000000000 +0000
+++ ruby-2.6.5/tool/config.guess    2020-01-01 11:23:43.822850111 +0000
@@ -388,25 +388,18 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
     echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
     exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
@@ -19,7 +19,7 @@
     echo i386-pc-auroraux"$UNAME_RELEASE"
     exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-    eval "$set_cc_for_build"
-    set_cc_for_build
-    SUN_ARCH=i386
-    # If there is a compiler, see if it is configured for 64-bit objects.
-    # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -38,14 +38,14 @@
     echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
     exit ;;
     sun4*:SunOS:6*:*)
--- ruby-2.5.3/tool/config.sub    2018-10-31 14:29:42.844771186 +0000
+++ ruby-2.5.3/tool/config.sub    2018-10-31 14:29:18.943384526 +0000
@@ -799,7 +799,7 @@ case $basic_machine in
         basic_machine=x86_64-pc
         ;;
--- ruby-2.6.5/tool/config.sub    2019-10-01 13:01:01.000000000 +0000
+++ ruby-2.6.5/tool/config.sub    2020-01-01 12:22:58.818201859 +0000
@@ -1008,7 +1008,7 @@ case $cpu-$vendor in
     # Here we normalize CPU types irrespective of the vendor
     amd64-*)
-        basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+        # don't change basic_machine
-        cpu=x86_64
+        # don't change cpu
         ;;
     amiga | amiga-*)
         basic_machine=m68k-unknown
     blackfin-*)
         cpu=bfin
components/ruby/ruby-26/ruby-26.p5m
@@ -723,7 +723,6 @@
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/images/zoom.png
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/index.rhtml
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/js/darkfish.js
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/js/jquery.js
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/js/search.js
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/page.rhtml
file path=usr/ruby/2.6/lib/ruby/2.6.0/rdoc/generator/template/darkfish/servlet_not_found.rhtml
@@ -1370,8 +1369,8 @@
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rake-12.3.2/lib/rake/version.rb
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rake-12.3.2/lib/rake/win32.rb
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rake-12.3.2/rake.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.0/exe/rdoc
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.0/exe/ri
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.2/exe/rdoc
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/rdoc-6.1.2/exe/ri
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/test-unit-3.2.9/COPYING
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/test-unit-3.2.9/GPL
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/gems/test-unit-3.2.9/LGPL
@@ -1518,7 +1517,7 @@
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/ostruct-0.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/prime-0.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/psych-3.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rdoc-6.1.0.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rdoc-6.1.2.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rexml-3.1.9.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/rss-0.2.7.gemspec
file path=usr/ruby/2.6/lib/ruby/gems/2.6.0/specifications/default/scanf-1.0.0.gemspec
components/ruby/ruby-26/test/results-64.master
@@ -4,4 +4,4 @@
222 tests, X assertions, 0 failures, 0 errors, X skips
# Running tests:
Finished tests in Xs, X tests/s, X assertions/s.
20413 tests, X assertions, 1 failures, 0 errors, X skips
20444 tests, X assertions, 0 failures, 0 errors, X skips