components/ruby/ruby-19/patches/01-yaml_rb.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Fri, 06 Jun 2014 13:45:34 -0700
changeset 1940 9b35341f1085
parent 1482 7a1f84fbc2d7
permissions -rw-r--r--
18908406 Checksum of OpenSSL FIPS tar ball should be checked with FIPS validated openssl
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1482
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     1
# Until we add libyaml to Solaris, ruby will build with syck instead of psych;
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     2
# eliminate warning message, so it won't show up for every invocation of gem
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     3
#
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     4
--- ruby-1.9.3-p448.orig/lib/yaml.rb	Wed May 29 05:00:57 2013
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     5
+++ ruby-1.9.3-p448/lib/yaml.rb	Mon Aug 26 14:57:17 2013
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     6
@@ -85,9 +85,10 @@
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     7
     require 'psych'
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     8
     engine = 'psych'
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
     9
   rescue LoadError
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    10
-    warn "#{caller[0]}:"
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    11
-    warn "It seems your ruby installation is missing psych (for YAML output)."
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    12
-    warn "To eliminate this warning, please install libyaml and reinstall your ruby."
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    13
+# remove warning for now, until libyaml is included in Solaris
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    14
+#    warn "#{caller[0]}:"
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    15
+#    warn "It seems your ruby installation is missing psych (for YAML output)."
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    16
+#    warn "To eliminate this warning, please install libyaml and reinstall your ruby."
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    17
     require 'syck'
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    18
     engine = 'syck'
7a1f84fbc2d7 PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7
April Chin <april.chin@oracle.com>
parents:
diff changeset
    19
   end