ruby-dev

長沢です。

某ML での「OMF Object format 対応」の成果をフィードバックします。

# あ、OS/2 上での話です。

まだちょっと system() 周りが怪しいため make test が完遂しないんですが、
それは今後の課題、ということで。

#多分それは、私が切った貼ったででっちあげた missing/os2.c のコードのせい(^^;;

あと、ext/pty.c への差分は「seteuid も setreuid も setresuid も無い環
境ではmake が通らない」点の修正です。

1.5.0 への差分になってます。
-- 
                           長沢　研二         - HGF01572@nifty.ne.jp -
                                              -   kenn@hma.att.ne.jp -
                                      /// Team OS/2 J at HAMAMATSU ///

Attachments (1)

rubyos2.patch (2.63 KB, text/x-diff)

diff -ru2p ruby/Makefile.in ruby-1.5/Makefile.in
--- ruby/Makefile.in	Sun Jan 30 07:33:25 2000
+++ ruby-1.5/Makefile.in	Sun Jan 30 06:38:50 2000
@@ -12,4 +12,6 @@ AUTOCONF = autoconf
 @SET_MAKE@
 
+.SUFFIXES: .obj
+
 prefix = @prefix@
 CFLAGS = @CFLAGS@
diff -ru2p ruby/configure.in ruby-1.5/configure.in
--- ruby/configure.in	Sun Jan 30 07:33:28 2000
+++ ruby-1.5/configure.in	Sun Jan 30 06:37:50 2000
@@ -145,4 +145,7 @@ human*)		ac_cv_func_getpgrp_void=yes;;
 beos*)		;;
 cygwin*)	;;
+os2_emx*)	LIBS="-lm $LIBS"
+		ac_cv_lib_xpg4_setlocale=no
+		ac_cv_lib_dir_opendir=no;;
 *) LIBS="-lm $LIBS";;
 esac
@@ -526,6 +529,6 @@ else
     cygwin*)	DLEXT=dll
 	 	AC_DEFINE(DLEXT, ".dll");;
-    os2_emx)	DLEXT=o
-	 	AC_DEFINE(DLEXT, ".so");;
+    os2_emx*)	DLEXT=dll
+	 	AC_DEFINE(DLEXT, ".dll");;
     *)		DLEXT=so
     		AC_DEFINE(DLEXT, ".so");;
@@ -611,5 +614,5 @@ rb_cv_missing_fconvert=yes, rb_cv_missin
   dnl OS/2 environment w/ Autoconf 2.1x for EMX
   os2_emx)
-    LIBOBJS="$LIBOBJS os2.o"
+    LIBOBJS="$LIBOBJS os2.$OBJEXT"
     setup=Setup.emx
     ;;
diff -ru2p ruby/ext/etc/extconf.rb ruby-1.5/ext/etc/extconf.rb
--- ruby/ext/etc/extconf.rb	Sun Jan 30 07:33:30 2000
+++ ruby-1.5/ext/etc/extconf.rb	Sun Jan 30 06:48:02 2000
@@ -16,5 +16,7 @@ EOF
 end
 
-have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
+if /i386-os2/ !~ RUBY_PLATFORM
+  have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
+end
 a = have_func("getlogin")
 b = have_func("getpwent")
diff -ru2p ruby/ext/extmk.rb.in ruby-1.5/ext/extmk.rb.in
--- ruby/ext/extmk.rb.in	Sun Jan 30 07:33:30 2000
+++ ruby-1.5/ext/extmk.rb.in	Sun Jan 30 06:43:30 2000
@@ -461,8 +461,18 @@ $(DLLIB): $(OBJS)
   end
 
+  if /i386-os2_emx/ =~ RUBY_PLATFORM
+    if  $OBJEXT != "o"
+    mfile.printf "\
+$(OBJS):
+	$(CC) $(CFLAGS) -c $<
+"
+    end
+  end
+ 
   if File.exist?("#{$srcdir}/depend")
     dfile = open("#{$srcdir}/depend", "r")
     mfile.printf "###\n"
     while line = dfile.gets()
+      line = line.gsub(/\.o/, ".#{$OBJEXT}")
       mfile.printf "%s", line.gsub('\$\(hdrdir\)/config.h', '$(topdir)/config.h')
     end
@@ -501,5 +511,5 @@ def extmake(target)
   $local_flags = ""
   case RUBY_PLATFORM
-  when /cygwin|beos|openstep|nextstep|rhapsody/
+  when /cygwin|beos|openstep|nextstep|rhapsody|i386-os2_emx/
     $libs = ""
   when /mswin32/
diff -ru2p ruby/ext/pty/pty.c ruby-1.5/ext/pty/pty.c
--- ruby/ext/pty/pty.c	Sun Jan 30 07:33:32 2000
+++ ruby-1.5/ext/pty/pty.c	Sun Jan 30 06:54:24 2000
@@ -283,5 +283,7 @@ establishShell(shellname, info)
 	close(slave);
 
+#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
 	seteuid(getuid());
+#endif
 
 	argc = 0;

Thread

Prev Next

In This Thread

Prev Next

[#8797] some peep hole optimizations and etc. — nobu.nakada@...

[#8817] Cross Compiling Ruby — WATANABE Hirofumi <eban@...>

[#8820] BEGIN as stmt. ? — EGUCHI Osamu <eguchi@...>

[#8824] [REQ] Integer#{hex,dec,oct,bin}, String#bin — gotoken@... (GOTO Kentaro)

[#8828] Re: [ruby-list:20054] Re: == === case — Shugo Maeda <shugo@...>

[#8848] cvs — gotoken@... (GOTO Kentaro)

[#8858] [PATCH] 2000/1/5 ruby_1_4 commit — Katsuyuki Komatsu <komatsu@...>

[#8859] [PATCH] 2000/1/5 1.5.0 commit — Katsuyuki Komatsu <komatsu@...>

[#8866] DoubleFloat — gotoken@... (GOTO Kentaro)

[#8886] Complex#divmod — Masahiro TANAKA <masa@...>

[#8893] Re: [ruby-list:20142] Re: Range expansion? — Akinori MUSHA aka knu <knu@...>

[#8900] [BUG] Marshal.dump — Koji Arai <JCA02266@...>

[#8927] [PATCH] Ruby/Tk (tktext.rb and tkcanvas.rb) — nagai@...

[#8930] [PATCH] SEGV at alias & super in module — nobu.nakada@...

[#8932] isnan.c NaN — "Shigeo Kobayashi" <shigeo@...>

[#8941] [BUG] recycle the ruby_dyna_vars — Koji Arai <JCA02266@...>

[#8953] rb_str2inum() — "Shigeo Kobayashi" <shigeo@...>

[#8959] [PATCH] getoptlong.rb — nobu.nakada@...

[#8980] 1.4.3 patch for near-future *BSD IPv6 support — Jun-ichiro itojun Hagino <itojun@...>

[#8986] sort — gotoken@... (GOTO Kentaro)

[#9004] DEFAULT_KCODE in rbconfig.rb — OKUNISHI -GTO- Fujikazu <fuji0924@...>

[#9007] too many warn — Minero Aoki <aamine@...>

[#9008] [PATCH] Array#flatten! for recursive array — nobu.nakada@...

[#9024] Re: [ruby-math:00115] Re: precedence of ** — matz@... (Yukihiro Matsumoto)

[#9025] % — "Shigeo Kobayashi" <shigeo@...>

[#9029] [1.4.3 BUG] Dir.grab["/*"] — gotoken@... (GOTO Kentaro)

[#9042] Ruby's overhead — "Shigeo Kobayashi" <shigeo@...>

[#9043] getrlimit — WATANABE Hirofumi <eban@...>

[#9044] setitimer — WATANABE Hirofumi <eban@...>

[#9047] rb_read_check is missing in rubyio.h — kenn@...

[#9048] [PATCH] OS/2 patch improved for 1.5.0 — kenn@...

[ruby-dev:9048] [PATCH] OS/2 patch improved for 1.5.0

Attachments (1)

Thread

In This Thread

[#8932] isnan.c 　 NaN — "Shigeo Kobayashi" <shigeo@...>