diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-18 01:18:34 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-18 01:18:34 +0000 |
commit | 4ad2057f27e1b03870d2ebcab7f7dbfca4b368ef (patch) | |
tree | 4d2f5aef23ff2a14eba5a2c43ad0f7deac0b2e70 /ext | |
parent | 6803c4e2a8e48e8f2f855015e4933a9947913b92 (diff) | |
download | ruby-4ad2057f27e1b03870d2ebcab7f7dbfca4b368ef.tar.gz |
* ChangeLog: Good-bye OS/2.
* common.mk: ditto.
* configure.in: ditto.
* dln_find.c: ditto.
* ext/Setup.emx: ditto.
* ext/extmk.rb: ditto.
* ext/socket/extconf.rb: ditto.
* ext/zlib/extconf.rb: ditto.
* file.c: ditto.
* include/ruby/defines.h: ditto.
* io.c: ditto.
* lib/mkmf.rb: ditto.
* missing/os2.c: ditto.
* process.c: ditto.
* ruby.c: ditto.
* NEWS: announce OS/2 is no longer supported.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/Setup.emx | 31 | ||||
-rwxr-xr-x | ext/extmk.rb | 1 | ||||
-rw-r--r-- | ext/socket/extconf.rb | 3 | ||||
-rw-r--r-- | ext/zlib/extconf.rb | 3 |
4 files changed, 0 insertions, 38 deletions
diff --git a/ext/Setup.emx b/ext/Setup.emx deleted file mode 100644 index d976a1854e..0000000000 --- a/ext/Setup.emx +++ /dev/null @@ -1,31 +0,0 @@ -# OS/2 environment w/ Autoconf 2.1x for EMX -option platform os2-emx -option nodynamic - -#Win32API -bigdecimal -#dbm -digest -digest/md5 -digest/rmd160 -digest/sha1 -digest/sha2 -enumerator -etc -fcntl -#gdbm -#io/wait -nkf -#openssl -#pty -racc/cparse -#readline -#ripper -#sdbm -socket -stringio -strscan -#syslog -#tk -#win32ole -#zlib diff --git a/ext/extmk.rb b/ext/extmk.rb index d8e9e86c0f..ad01ff4d2b 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -50,7 +50,6 @@ elsif !File.chardev?(@null = "/dev/null") end def sysquote(x) - @quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM) @quote ? x.quote : x end diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 9a6af8be09..459c10e3cf 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -441,9 +441,6 @@ when /beos/ when /haiku/ test_func = "socket(0,0,0)" have_library("network", "socket(0,0,0)", headers) -when /i386-os2_emx/ - test_func = "socket(0,0,0)" - have_library("socket", "socket(0,0,0)", headers) else test_func = "socket(0,0,0)" have_library("nsl", 't_open("", 0, (struct t_info *)NULL)', headers) # SunOS diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb index b4348ceca7..4480d3532a 100644 --- a/ext/zlib/extconf.rb +++ b/ext/zlib/extconf.rb @@ -20,8 +20,6 @@ if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset') case RUBY_PLATFORM.split('-',2)[1] when 'amigaos' then os_code = 'AMIGA' - when /\Aos2[\-_]emx\z/ then - os_code = 'OS2' when /mswin|mingw|bccwin/ then # NOTE: cygwin should be regarded as Unix. os_code = 'WIN32' @@ -36,7 +34,6 @@ if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset') 'OS_VMS' => 'VMS', 'OS_UNIX' => 'Unix', 'OS_ATARI' => 'Atari', - 'OS_OS2' => 'OS/2', 'OS_MACOS' => 'MacOS', 'OS_TOPS20' => 'TOPS20', 'OS_WIN32' => 'Win32', |