ruby-dev

長沢です。

[ruby-dev:11037] からのスレッドでの結論から、以下のpatch で良いんじゃ
ないかと思います。結局、RUBYLIB_PREFIX の方は「いずれ無くなるもの」と
いうことで、触ってません。

# 1.6.1 には間に合わなかったかぁ…

-- 
                           長沢　研二         - HGF01572@nifty.ne.jp -
                                              -   kenn@hma.att.ne.jp -
                                      /// Team OS/2 J at HAMAMATSU ///

Attachments (2)

ruby.c.diff (867 Bytes, text/x-diff)

Index: ruby.c
===================================================================
RCS file: /home/cvs/ruby/ruby.c,v
retrieving revision 1.33
diff -c -r1.33 ruby.c
*** ruby.c	2000/09/21 06:37:16	1.33
--- ruby.c	2000/09/27 13:32:45
***************
*** 205,211 ****
  void
  ruby_init_loadpath()
  {
! #if defined(_WIN32) || defined(DJGPP)
      char libpath[FILENAME_MAX+1];
      char *p;
      size_t rest;
--- 205,211 ----
  void
  ruby_init_loadpath()
  {
! #if defined(_WIN32) || defined(DJGPP) || defined(__EMX__)
      char libpath[FILENAME_MAX+1];
      char *p;
      size_t rest;
***************
*** 214,219 ****
--- 214,221 ----
  #elif defined(DJGPP)
      extern char *__dos_argv0;
      strncpy(libpath, __dos_argv0, FILENAME_MAX);
+ #elif defined(__EMX__)
+     _execname(libpath, FILENAME_MAX);
  #endif
      p = strrchr(libpath, '\\');
      if (p) {

configure.in.diff (1.18 KB, text/x-diff)

Index: configure.in
===================================================================
RCS file: /home/cvs/ruby/configure.in,v
retrieving revision 1.63
diff -c -r1.63 configure.in
*** configure.in	2000/09/27 06:48:23	1.63
--- configure.in	2000/09/27 13:32:55
***************
*** 900,906 ****
  
  RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
  case "$target_os" in
!   cygwin*|mingw*|*djgpp*)
      RUBY_LIB_PREFIX="/lib/ruby"
      ;;
    *)
--- 900,906 ----
  
  RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
  case "$target_os" in
!   cygwin*|mingw*|*djgpp*|os2_emx*)
      RUBY_LIB_PREFIX="/lib/ruby"
      ;;
    *)
***************
*** 915,921 ****
              [sitedir='${prefix}/lib/ruby/site_ruby'])
  SITE_DIR="`eval "echo ${sitedir}"`"
  case "$target_os" in
!   cygwin*|mingw*|*djgpp*)
      RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
      RUBY_SITE_LIB_PATH="$SITE_DIR";;
    *)
--- 915,921 ----
              [sitedir='${prefix}/lib/ruby/site_ruby'])
  SITE_DIR="`eval "echo ${sitedir}"`"
  case "$target_os" in
!   cygwin*|mingw*|*djgpp*|os2_emx*)
      RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
      RUBY_SITE_LIB_PATH="$SITE_DIR";;
    *)

Thread

Prev Next

In This Thread

Prev Next

[#10781] MatchingData#[] — Shugo Maeda <shugo@...>

[#10793] 今度こそ (patch of the ruby-1.4.6 for NT4.0&VC4.0 on DEC Alpha.) — kou@...1609.sip.eee.yamaguchi-u.ac.jp (Koichi Okada)

[#10812] empty rescue clause — Takaaki Tateishi <ttate@...>

[#10814] Re: ruby 1.6.0 preview2 — tenmei@... (Noriaki Harada)

[#10829] [BUG] re_search with range — Minero Aoki <aamine@...>

[#10856] typo in finalize.rb — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10861] MatchingData#last_group — Shugo Maeda <shugo@...>

[#10864] a = []; p a.sort! — "Akinori -Aki- MUSHA" <knu@...>

[#10866] Class Variable (sono 2) — Shin-ichiro HARA <sinara@...>

[#10879] recursive require / preload — Yasushi Shoji <yashi@...>

[#10882] setenv,unsetenv — Takaaki Tateishi <ttate@...>

[#10889] Re: mod_ruby error? — Wakou Aoyama <wakou@...>

[#10890] Re: Telnet#preprocess — Wakou Aoyama <wakou@...>

[#10891] Re: net/telnet.rb — Wakou Aoyama <wakou@...>

[#10892] Re: lib/cgi.rb — Wakou Aoyama <wakou@...>

[#10893] Re: lib/cgi.rb — Wakou Aoyama <wakou@...>

[#10894] Forward: [ruby-ext:01274] Re: 多重代入での to_a (Re: Ruby/Python doesn't work with Ruby 1.6) — matz@... (Yukihiro Matsumoto)

[#10897] Re: [CVS 266] "matz: 1.6.0 final (hopufully)" — WATANABE Hirofumi <Hirofumi.Watanabe@...>

[#10903] Class Variable と継承 — Kazuhiro NISHIYAMA <zn@...>

[#10904] Module#class_variables — Yasushi Shoji <yashi@...>

[#10907] attr_tester — Yasushi Shoji <yashi@...>

[#10910] tsvr.rb broken ? — Katsuyuki Komatsu <komatsu@...>

[#10911] time.rb — Katsuyuki Komatsu <komatsu@...>

[#10920] SIGINT on windows — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10921] proper tail recursion — Shugo Maeda <shugo@...>

[#10924] instance methods of Module/Class — Hiroshi IGARASHI <igarashi@...>

[#10928] man ruby — Takaaki Tateishi <ttate@...>

[#10933] Meta-Level API — Hiroshi IGARASHI <igarashi@...>

[#10943] Passing []/String as argument — Jun Adachi <adachi@...>

[#10944] dummy DLL on Windows — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10946] require "marshal" failure — Katsuyuki Komatsu <komatsu@...>

[#10948] File::Constants — Yasushi Shoji <yashi@...>

[#10952] negative signal number — GOTOU YUUZOU <gotoyuzo@...>

[#10956] server maintenance — Shugo Maeda <shugo@...>

[#10959] match data — 助田 雅紀 <masaki.suketa@...>

[#10968] jcode.rb bug — "Okada Jun" <yun@...>

[#10978] [PATCH] require in require — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#10985] httphead.rb proxy version problem — Katsuyuki Komatsu <komatsu@...>

[#10988] [patch] String#index( sub, pos, range ) — Minero Aoki <aamine@...>

[#11006] lstat — WATANABE Hirofumi <eban@...>

[#11028] regex.c warning of alpha — Katsuyuki Komatsu <komatsu@...>

[#11037] RUBYLIB_PRIFIX at emx/gcc — kenn@...

[#11049] [PATCH] RTEST() value as boolean — nobu.nakada@...

[#11052] ruby-1.6.1-20000921-i386-cygwin and Thread — Shin-ichiro HARA <sinara@...>

[#11061] [PATCH] prefix for sitedir — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#11064] jcode.rb bug — KANEKO Naoshi <wbs01621@...>

[#11066] [PATCH] gcc extension in regex.c — "Nobuyoshi.Nakada" <nobu.nakada@...>

[#11073] expect.rb — Kazuhiro NISHIYAMA <zn@...>

[#11074] 定数のネスト — Kazuhiro NISHIYAMA <zn@...>

[#11078] test — Shugo Maeda <shugo@...>

[#11082] LIBPATH patch for emx/gcc — kenn@...

[#11083] Application Error in 1.6.0 on Win2K — matz@... (Yukihiro Matsumoto)

[#11090] Ruby CVS Repository — "Akinori -Aki- MUSHA" <knu@...>

[#11091] ruby 1.6.1 mingw32 bug? — kenn@...

[#11093] gsub! : not substitute if block returns nil — Masahiro Tanaka <masa@...>

[#11098] mod_ruby error? — akira yamada / やまだあきら <akira@...>

[ruby-dev:11082] LIBPATH patch for emx/gcc

Attachments (2)

Thread

In This Thread

[#10959] match data — 助田　雅紀 <masaki.suketa@...>