summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-04-16 10:41:54 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-04-16 10:41:54 +0000
commitf4c42434297a7b5a4a49c3d65d1a1d6885a8081f (patch)
tree264d6f870f34403ba27680a1803331410abe83d7
parentd5db6fd46ef39538766493e1221ca070cff26148 (diff)
1.1b9_11
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--config.sub10
-rw-r--r--ext/extmk.rb.in3
-rw-r--r--io.c21
-rw-r--r--version.h4
5 files changed, 17 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 4187c0612ee..58d0b9cb05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
Thu Apr 16 16:52:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
+ * experimental release 1.1b9_11.
+
* lib/tk.rb: thread support (experimental - maybe slow).
* eval.c (rb_longjmp): trace event on exception in raising
@@ -25,14 +27,14 @@ Thu Apr 16 01:38:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (str_new4): need not to duplicate frozen strings.
-Wed Apr 15 12:24:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * config.sub: x68 condition restored.
-
Wed Apr 15 08:33:47 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
* struct.c (struct_inspect): remove restriction for struct names.
+Wed Apr 15 02:55:02 1998 Kazuya 'Sharl' Masuda <sharl@www.ufo.co.jp>
+
+ * x68 patches to config.sub, ext/extmk.rb.in
+
Wed Apr 15 01:22:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* string.c (str_dup_frozen): do not duplicate frozen strings.
diff --git a/config.sub b/config.sub
index b16b2c0c7d0..d37810352f3 100644
--- a/config.sub
+++ b/config.sub
@@ -662,10 +662,6 @@ case $basic_machine in
orion105)
basic_machine=clipper-highlevel
;;
- human)
- basic_machine=m68k-sharp
- os=-human
- ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@@ -680,6 +676,10 @@ case $basic_machine in
*-commodore*)
basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
;;
+ human)
+ basic_machine=m68k-sharp
+ os=-human
+ ;;
*)
;;
esac
@@ -781,6 +781,8 @@ case $os in
-xenix)
os=-xenix
;;
+ -human)
+ ;;
-none)
;;
*)
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 8fa333cf688..fbc455840c2 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -483,6 +483,9 @@ if $extlist.size > 0
end
$extobjs = "ext/extinit.o " + $extobjs
+ if PLATFORM == "m68k-human"
+ $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
+ end
system format('make ruby@binsuffix@ EXTOBJS="%s" EXTLIBS="%s"', $extobjs, $extlibs)
else
Dir.chdir ".."
diff --git a/io.c b/io.c
index ee5f19e0699..dea947e1fa9 100644
--- a/io.c
+++ b/io.c
@@ -1491,26 +1491,6 @@ obj_display(argc, argv, self)
return Qnil;
}
-static VALUE
-obj_displayln(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
- VALUE out;
- VALUE str;
-
- rb_scan_args(argc, argv, "01", &out);
- if (NIL_P(out)) {
- out = rb_defout;
- }
-
- io_write(out, self);
- io_write(rb_defout, RS_default);
-
- return Qnil;
-}
-
static void
io_defset(val, id)
VALUE val;
@@ -2436,7 +2416,6 @@ Init_IO()
rb_define_global_function("p", f_p, 1);
rb_define_method(mKernel, "display", obj_display, -1);
- rb_define_method(mKernel, "displayln", obj_displayln, -1);
cIO = rb_define_class("IO", cObject);
rb_include_module(cIO, mEnumerable);
diff --git a/version.h b/version.h
index 83943fbe60b..3ec1b2da9b1 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define RUBY_VERSION "1.1b9_10"
-#define VERSION_DATE "98/04/14"
+#define RUBY_VERSION "1.1b9_11"
+#define VERSION_DATE "98/04/16"