author | April Chin <april.chin@oracle.com> |
Wed, 06 Nov 2013 14:12:13 -0800 | |
branch | s11-update |
changeset 2813 | db0bfa0fa498 |
permissions | -rw-r--r-- |
2813
db0bfa0fa498
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; |
db0bfa0fa498
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 |
db0bfa0fa498
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 |
# |
db0bfa0fa498
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 |
db0bfa0fa498
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 |
db0bfa0fa498
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 @@ |
db0bfa0fa498
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' |
db0bfa0fa498
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' |
db0bfa0fa498
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 |
db0bfa0fa498
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]}:" |
db0bfa0fa498
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)." |
db0bfa0fa498
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." |
db0bfa0fa498
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 |
db0bfa0fa498
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]}:" |
db0bfa0fa498
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)." |
db0bfa0fa498
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." |
db0bfa0fa498
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' |
db0bfa0fa498
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' |
db0bfa0fa498
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 |