public
Description: ruby lang (www.ruby-lang.org) svn mirror
Homepage: http://svn.ruby-lang.org/repos/ruby/
Clone URL: git://github.com/juretta/ruby.git
* djgpp/*: sync with the latest.
* ext/extmk.rb, lib/mkmf.rb: flush $stdout.
* io.c (READ_DATA_PENDING_COUNT, READ_DATA_PENDING_PTR):
  undef these macros on DJGPP.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3007 
b2dd03c8-39d4-4d8f-98ff-823fe69b080e
eban (author)
Sun Oct 27 01:04:55 -0800 2002
commit  7de3b37866d4e0f0de32ef9683752a8a68e7786c
tree    644d368eeeb420fad281c91d9f276bec630fe2c9
parent  9e4541df3e123dd611acb32e88d7742fcca6d604
...
3
4
5
6
 
7
8
9
...
3
4
5
 
6
7
8
9
0
@@ -3,7 +3,7 @@
0
 This is what you need to do to compile and install Ruby:
0
 
0
   1. Run configure.bat, which will generate config.h and Makefile
0
- and ext/extmk.rb(GNU sed required).
0
+ (GNU sed required).
0
      Message like this is normal:
0
        sed.exe: can't read 123456789: No such file or directory (ENOENT)
0
 
...
71
72
73
74
75
76
77
78
...
96
97
98
99
100
101
102
...
106
107
108
 
109
110
 
111
112
113
...
71
72
73
 
 
74
75
76
...
94
95
96
 
97
98
99
...
103
104
105
106
107
 
108
109
110
111
0
@@ -71,8 +71,6 @@
0
 #define HAVE_HYPOT 1
0
 #define HAVE_ACOSH 1
0
 #define HAVE_FMOD 1
0
-#define HAVE_DRAND48 1
0
-#define HAVE_RANDOM 1
0
 #define HAVE_WAITPID 1
0
 #define HAVE_FSYNC 1
0
 #define HAVE_TRUNCATE 1
0
@@ -96,7 +94,6 @@
0
 #define HAVE_COSH 1
0
 #define HAVE_SINH 1
0
 #define HAVE_TANH 1
0
-#define HAVE_INITSTATE 1
0
 #define HAVE_STRUCT_TM_TM_ZONE 1
0
 #define HAVE_TM_ZONE 1
0
 #define HAVE_STRUCT_TM_TM_GMTOFF 1
0
@@ -106,8 +103,9 @@
0
 #define RSHIFT(x,y) ((x)>>(int)y)
0
 #define FILE_COUNT _cnt
0
 #define FILE_READPTR _ptr
0
+#define NEED_IO_FLUSH_BETWEEN_RW 1
0
 #define DEFAULT_KCODE KCODE_NONE
0
-#define DLEXT ".o"
0
+#define DLEXT ".so"
0
 #define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
0
 #define RUBY_SITE_LIB "/lib/ruby/site_ruby"
0
 #define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
...
76
77
78
79
80
81
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
82
83
...
1
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
 
 
 
 
 
 
 
 
 
 
 
 
3
4
5
...
8
9
10
 
 
 
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
0
@@ -1,73 +1,5 @@
0
 /^SHELL/s,/bin/sh,$(COMSPEC),
0
-s%@srcdir@%.%g
0
-s%@top_srcdir@%..%
0
-s%@CFLAGS@%-O2%g
0
-s%@CPPFLAGS@%%g
0
-s%@CXXFLAGS@%%g
0
-s%@LDFLAGS@%%g
0
-s%@LIBS@%-lm %g
0
-s%@exec_prefix@%${prefix}%g
0
-s%@prefix@%/usr/local%g
0
-s%@program_transform_name@%s,x,x,%g
0
-s%@bindir@%${exec_prefix}/bin%g
0
-s%@sbindir@%${exec_prefix}/sbin%g
0
-s%@libexecdir@%${exec_prefix}/libexec%g
0
-s%@datadir@%${prefix}/share%g
0
-s%@sysconfdir@%${prefix}/etc%g
0
-s%@sharedstatedir@%${prefix}/com%g
0
-s%@localstatedir@%${prefix}/var%g
0
-s%@libdir@%${exec_prefix}/lib%g
0
-s%@includedir@%${prefix}/include%g
0
-s%@oldincludedir@%/usr/include%g
0
-s%@infodir@%${prefix}/info%g
0
-s%@mandir@%${prefix}/man%g
0
-s%@host@%i386-pc-msdosdjgpp%g
0
-s%@host_alias@%i386-msdosdjgpp%g
0
-s%@host_cpu@%i386%g
0
-s%@host_vendor@%pc%g
0
-s%@host_os@%msdosdjgpp%g
0
-s%@CC@%gcc%g
0
-s%@CPP@%gcc -E%g
0
-s%@YACC@%bison -y%g
0
-s%@RANLIB@%ranlib%g
0
-s%@AR@%ar%g
0
-s%@INSTALL_PROGRAM@%${INSTALL}%g
0
-s%@INSTALL_DATA@%${INSTALL} -m 644%g
0
-s%@SET_MAKE@%%g
0
-s%@LIBOBJS@% crypt.o flock.o vsnprintf.o%g
0
-s%@ALLOCA@%%g
0
-s%@DEFAULT_KCODE@%%g
0
-s%@EXEEXT@%.exe%g
0
-s%@OBJEXT@%o%g
0
-s%@XLDFLAGS@%%g
0
-s%@DLDFLAGS@%%g
0
-s%@STATIC@%%g
0
-s%@CCDLFLAGS@%%g
0
-s%@LDSHARED@%ld%g
0
-s%@DLEXT@%o%g
0
-s%@STRIP@%strip%g
0
-s%@EXTSTATIC@%%g
0
-s%@binsuffix@%.exe%g
0
-s%@setup@%Setup.dj%g
0
-s%@LIBRUBY@%libruby.a%g
0
-s%@LIBRUBY_A@%libruby.a%g
0
-s%@LIBRUBYARG@%libruby.a%g
0
-s%@LIBRUBY_SO@%%g
0
-s%@SOLIBS@%%g
0
-s%@arch@%i386-msdosdjgpp%g
0
 ;s%/bin/rm%rm%
0
-s%@DLDLIBS@%-lc%g
0
-s%@MAINLIBS@%%g
0
-s%@PREP@%%
0
-s%@RUBY_INSTALL_NAME@%ruby%g
0
-s%@RUBY_SO_NAME@%%g
0
-s%@arch@%i386-msdosdjgpp%g
0
-s%@sitedir@%${prefix}/lib/ruby/site_ruby%g
0
-s%@configure_args@%%g
0
-s%@MINIRUBY@%./miniruby%
0
-s%@OUTFLAG@%-o %
0
-s%@CPPOUTFILE@%-o conftest.i%
0
-s%@archlib@%/lib/ruby/i386-msdosdjgpp%
0
 ;s%|| true%%
0
 ;/\/dev\/null/ {
0
 ;s,/dev/null 2>&1, nul,
0
@@ -76,8 +8,121 @@ s%@archlib@%/lib/ruby/i386-msdosdjgpp%
0
 ;/^config.status/ {
0
 ; N;N;N;N;N;d
0
 ;}
0
-#;s%mv -f y\.tab\.c%if exist parse.c del parse.c\
0
-# ren y_tab.c%
0
-#;s%y\.tab\.c%y_tab.c%
0
+:t
0
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
0
+s,@srcdir@,.,g;t t
0
+s,@top_srcdir@,..,;t t
0
+s,@PATH_SEPARATOR@,:,;t t
0
+s,@PACKAGE_NAME@,,;t t
0
+s,@PACKAGE_TARNAME@,,;t t
0
+s,@PACKAGE_VERSION@,,;t t
0
+s,@PACKAGE_STRING@,,;t t
0
+s,@PACKAGE_BUGREPORT@,,;t t
0
+s,@exec_prefix@,${prefix},;t t
0
+s,@prefix@,/dev/env/DJDIR,;t t
0
+s,@program_transform_name@,s:^::,;t t
0
+s,@bindir@,${exec_prefix}/bin,;t t
0
+s,@sbindir@,${exec_prefix}/sbin,;t t
0
+s,@libexecdir@,${exec_prefix}/libexec,;t t
0
+s,@datadir@,${prefix}/share,;t t
0
+s,@sysconfdir@,${prefix}/etc,;t t
0
+s,@sharedstatedir@,${prefix}/com,;t t
0
+s,@localstatedir@,${prefix}/var,;t t
0
+s,@libdir@,${exec_prefix}/lib,;t t
0
+s,@includedir@,${prefix}/include,;t t
0
+s,@oldincludedir@,/usr/include,;t t
0
+s,@infodir@,${prefix}/info,;t t
0
+s,@mandir@,${prefix}/man,;t t
0
+s,@build_alias@,i586-pc-msdosdjgpp,;t t
0
+s,@host_alias@,i586-pc-msdosdjgpp,;t t
0
+s,@target_alias@,i386-msdosdjgpp,;t t
0
+s,@DEFS@,,;t t
0
+s,@ECHO_C@,,;t t
0
+s,@ECHO_N@,-n,;t t
0
+s,@ECHO_T@,,;t t
0
+s,@LIBS@,-lm ,;t t
0
+s,@MAJOR@,1,;t t
0
+s,@MINOR@,7,;t t
0
+s,@TEENY@,3,;t t
0
+s,@build@,i586-pc-msdosdjgpp,;t t
0
+s,@build_cpu@,i586,;t t
0
+s,@build_vendor@,pc,;t t
0
+s,@build_os@,msdosdjgpp,;t t
0
+s,@host@,i586-pc-msdosdjgpp,;t t
0
+s,@host_cpu@,i586,;t t
0
+s,@host_vendor@,pc,;t t
0
+s,@host_os@,msdosdjgpp,;t t
0
+s,@target@,i386-pc-msdosdjgpp,;t t
0
+s,@target_cpu@,i386,;t t
0
+s,@target_vendor@,pc,;t t
0
+s,@target_os@,msdosdjgpp,;t t
0
+s,@CC@,gcc,;t t
0
+s,@ac_ct_CC@,,;t t
0
+s,@CFLAGS@,-Os,;t t
0
+s,@LDFLAGS@,,;t t
0
+s,@CPPFLAGS@,,;t t
0
+s,@EXEEXT@,.exe,;t t
0
+s,@OBJEXT@,o,;t t
0
+s,@CPP@,gcc -E,;t t
0
+s,@EGREP@,grep -E,;t t
0
+s,@GNU_LD@,yes,;t t
0
+s,@CPPOUTFILE@,-o conftest.i,;t t
0
+s,@OUTFLAG@,-o ,;t t
0
+s,@YACC@,bison -y,;t t
0
+s,@RANLIB@,ranlib,;t t
0
+s,@ac_ct_RANLIB@,,;t t
0
+s,@AR@,ar,;t t
0
+s,@ac_ct_AR@,,;t t
0
+s,@NM@,,;t t
0
+s,@ac_ct_NM@,,;t t
0
+s,@WINDRES@,,;t t
0
+s,@ac_ct_WINDRES@,,;t t
0
+s,@DLLWRAP@,,;t t
0
+s,@ac_ct_DLLWRAP@,,;t t
0
+s,@LN_S@,ln -s,;t t
0
+s,@SET_MAKE@,,;t t
0
+s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
0
+s,@ALLOCA@,,;t t
0
+s,@XCFLAGS@,,;t t
0
+s,@XLDFLAGS@, -L.,;t t
0
+s,@DLDFLAGS@,,;t t
0
+s,@STATIC@,,;t t
0
+s,@CCDLFLAGS@,,;t t
0
+s,@LDSHARED@,ld,;t t
0
+s,@DLEXT@,so,;t t
0
+s,@DLEXT2@,,;t t
0
+s,@LIBEXT@,a,;t t
0
+s,@LINK_SO@,,;t t
0
+s,@LIBPATHFLAG@, -L%s,;t t
0
+s,@STRIP@,strip,;t t
0
+s,@EXTSTATIC@,,;t t
0
+s,@setup@,Setup.dj,;t t
0
+s,@MINIRUBY@,./miniruby,;t t
0
+s,@PREP@,,;t t
0
+s,@ARCHFILE@,,;t t
0
+s,@LIBRUBY_LDSHARED@,ld,;t t
0
+s,@LIBRUBY_DLDFLAGS@,,;t t
0
+s,@RUBY_INSTALL_NAME@,ruby,;t t
0
+s,@rubyw_install_name@,,;t t
0
+s,@RUBYW_INSTALL_NAME@,,;t t
0
+s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
0
+s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
0
+s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
0
+s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
0
+s,@LIBRUBY@,$(LIBRUBY_A),;t t
0
+s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
0
+s,@SOLIBS@,,;t t
0
+s,@DLDLIBS@,-lc,;t t
0
+s,@ENABLE_SHARED@,no,;t t
0
+s,@MAINLIBS@,,;t t
0
+s,@COMMON_LIBS@,,;t t
0
+s,@COMMON_MACROS@,,;t t
0
+s,@COMMON_HEADERS@,,;t t
0
+s,@EXPORT_PREFIX@,,;t t
0
+s,@MAKEFILES@,Makefile,;t t
0
+s,@arch@,i386-msdosdjgpp,;t t
0
+s,@sitearch@,i386-msdosdjgpp,;t t
0
+s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
0
+s,@configure_args@,,;t t
0
 /^,THIS_IS_DUMMY_PATTERN_/i\
0
 ac_given_srcdir=.
...
5
6
7
8
9
10
11
...
5
6
7
 
8
9
10
0
@@ -5,7 +5,6 @@ if exist djgpp\version.sed goto exist
0
 :exist
0
 set _conv_=-f djgpp\config.sed -f djgpp\version.sed
0
 sed %_conv_% < Makefile.in > Makefile
0
-sed %_conv_% < ext\extmk.rb.in > ext\extmk.rb
0
 sed %_conv_% < djgpp\config.hin > config.h
0
 echo LFN check > 12345678
0
 sed -n /LFN/d 123456789 > nul
...
207
208
209
 
210
211
212
...
216
217
218
 
219
220
221
...
207
208
209
210
211
212
213
...
217
218
219
220
221
222
223
0
@@ -207,6 +207,7 @@ if $extlist.size > 0
0
     "#{n}=#{v}" if v and !(v = v.strip).empty?
0
   }.compact
0
   puts conf
0
+ $stdout.flush
0
   ARGV.concat(conf)
0
 end
0
 rubies = []
0
@@ -216,6 +217,7 @@ rubies = []
0
 
0
 Dir.chdir ".."
0
 puts "making #{rubies.join(', ')}"
0
+$stdout.flush
0
 ARGV.concat(rubies)
0
 host = (defined?(CROSS_COMPILING) ? CROSS_COMPILING : RUBY_PLATFORM)
0
 /mswin|bccwin|mingw|djgpp|human|os2|macos/ =~ host or exec(*ARGV)
0
...
141
142
143
 
144
145
146
147
148
149
 
 
 
 
 
150
151
152
...
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
0
@@ -141,12 +141,18 @@ static VALUE lineno;
0
 extern int ReadDataPending();
0
 # define READ_DATA_PENDING(fp) (!feof(fp))
0
 #endif
0
+
0
 #ifndef READ_DATA_PENDING_PTR
0
 # ifdef FILE_READPTR
0
 # define READ_DATA_PENDING_PTR(fp) ((fp)->FILE_READPTR)
0
 # endif
0
 #endif
0
 
0
+#if defined __DJGPP__
0
+# undef READ_DATA_PENDING_COUNT
0
+# undef READ_DATA_PENDING_PTR
0
+#endif
0
+
0
 #define READ_CHECK(fp) do {\
0
     if (!READ_DATA_PENDING(fp)) {\
0
   rb_thread_wait_fd(fileno(fp));\
...
129
130
131
 
132
133
134
...
139
140
141
 
142
143
144
145
146
147
 
148
149
150
...
636
637
638
639
 
640
641
642
...
787
788
789
 
790
791
792
...
129
130
131
132
133
134
135
...
140
141
142
143
144
145
146
147
148
149
150
151
152
153
...
639
640
641
 
642
643
644
645
...
790
791
792
793
794
795
796
0
@@ -129,6 +129,7 @@ module Logging
0
 
0
   def self::open
0
     @log ||= File::open(@logfile, 'w')
0
+ @log.sync = true
0
     $stderr.reopen(@log)
0
     $stdout.reopen(@log)
0
     yield
0
@@ -139,12 +140,14 @@ module Logging
0
 
0
   def self::message(*s)
0
     @log ||= File::open(@logfile, 'w')
0
+ @log.sync = true
0
     @log.printf(*s)
0
   end
0
 
0
   def self::logfile file
0
     @logfile = file
0
     if @log and not @log.closed?
0
+ @log.flush
0
       @log.close
0
       @log = nil
0
     end
0
@@ -636,7 +639,7 @@ def create_makefile(target, srcprefix = nil)
0
     for lib in $libs.split
0
       lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
0
     end
0
- $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
0
+ $defs.push(format("-DEXTLIB='%s'", $libs.split.join(",")))
0
   end
0
 
0
   if target.include?('/')
0
@@ -787,6 +790,7 @@ def init_mkmf(config = CONFIG)
0
   $OBJEXT = config["OBJEXT"].dup
0
   $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
0
   $LIBRUBYARG = config['LIBRUBYARG']
0
+ $LIBPATH = []
0
 
0
   $objs = nil
0
   $libs = ""

Comments

    No one has commented yet.