kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Drop support for BeOS

Browse source 
* beos: Drop support for BeOS now that Haiku is stable.
  [Fix GH-1112]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-11-24 00:17:11 +00:00
parent f7847ecb72
commit 13a935b0ba
15 changed files with 17 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Nov 24 09:17:02 2015 Alexander von Gluck IV <kallisti5@unixzen.com>
* beos: Drop support for BeOS now that Haiku is stable.
[Fix GH-1112]
Tue Nov 24 09:16:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Nov 24 09:16:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* internal.h (rb_gc_for_fd): move to export, as referred by * internal.h (rb_gc_for_fd): move to export, as referred by

2
NEWS
View file

@ -242,6 +242,8 @@ with all sufficient information, see the ChangeLog file.
* OS/2 is no longer supported * OS/2 is no longer supported
* BeOS is no longer supported
* Borland-C is no longer supported * Borland-C is no longer supported
* Haiku now stable and best effort * Haiku now stable and best effort

37
configure.in
View file

@ -1139,15 +1139,8 @@ main()
fi fi
fi fi
], ],
[beos*], [
ac_cv_func_link=no
ac_cv_func_sched_yield=no
ac_cv_func_pthread_attr_setinheritsched=no
ac_cv_header_net_socket_h=yes
LIBS="$LIBS" # m lib is include in root under BeOS
],
[haiku*], [ [haiku*], [
LIBS="$LIBS" LIBS="$LIBS" # m lib is include in root
], ],
[cygwin*], [ ac_cv_header_langinfo_h=yes [cygwin*], [ ac_cv_header_langinfo_h=yes
AC_CHECK_FUNCS(cygwin_conv_path) AC_CHECK_FUNCS(cygwin_conv_path)
@ -3072,7 +3065,7 @@ if test "$with_dln_a_out" != yes; then
# mkmf.rb's have_header() to fail if the desired resource happens to be # mkmf.rb's have_header() to fail if the desired resource happens to be
# installed in the /usr/local tree. # installed in the /usr/local tree.
RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)], RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
[bsdi*|beos*|cygwin*|mingw*|aix*|interix*], [ ], [bsdi*|cygwin*|mingw*|aix*|interix*], [ ],
[ [
RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)]) RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
else else
@ -3170,20 +3163,6 @@ if test "$with_dln_a_out" != yes; then
: ${LIBPATHENV=LIBPATH} : ${LIBPATHENV=LIBPATH}
RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}" RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[beos*], [ AS_CASE(["$target_cpu"],
[powerpc*], [
: ${LDSHARED='$(LD) -xms'}
EXTDLDFLAGS='-export $(TARGET_ENTRY)'
DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
],
[i586*], [
: ${LDSHARED='$(LD) -shared'}
DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lroot"
LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lroot"
])
: ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes],
[nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" [nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
: ${LDSHARED='$(LD) -Bshareable -x'} : ${LDSHARED='$(LD) -Bshareable -x'}
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
@ -3565,7 +3544,7 @@ LIBRUBYARG='$(LIBRUBYARG_STATIC)'
SOLIBS= SOLIBS=
AS_CASE(["$target_os"], AS_CASE(["$target_os"],
[cygwin*|mingw*|beos*|haiku*|darwin*], [ [cygwin*|mingw*|haiku*|darwin*], [
: ${DLDLIBS=""} : ${DLDLIBS=""}
], ],
[ [
@ -3685,12 +3664,6 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}' LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
SOLIBS='-lm -lc' SOLIBS='-lm -lc'
], ],
[beos*], [
AS_CASE(["$target_cpu"],
[powerpc*], [
LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
])
],
[darwin*], [ [darwin*], [
RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)' RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_LDSHARED='$(CC) -dynamiclib' LIBRUBY_LDSHARED='$(CC) -dynamiclib'
@ -3917,10 +3890,6 @@ AS_CASE(["$target_os"],
CFLAGS="$CFLAGS -std" CFLAGS="$CFLAGS -std"
fi fi
], ],
[beos*], [
AS_CASE(["$target_cpu"],[powerpc*], [CFLAGS="$CFLAGS -relax_pointers"])
CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
],
[cygwin*|mingw*], [ [cygwin*|mingw*], [
RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)' RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'

52
dln.c
View file

@ -85,10 +85,6 @@ char *getenv();
# endif # endif
#endif #endif
#if defined(__BEOS__)
# include <image.h>
#endif
#ifndef dln_loaderror #ifndef dln_loaderror
static void static void
dln_loaderror(const char *format, ...) dln_loaderror(const char *format, ...)
@ -1442,54 +1438,6 @@ dln_load(const char *file)
} }
#endif #endif
#if defined(__BEOS__)
# define DLN_DEFINED
{
status_t err_stat; /* BeOS error status code */
image_id img_id; /* extension module unique id */
void (*init_fct)(); /* initialize function for extension module */
/* load extension module */
img_id = load_add_on(file);
if (img_id <= 0) {
dln_loaderror("Failed to load add_on %.200s error_code=%x",
file, img_id);
}
/* find symbol for module initialize function. */
/* The Be Book KernelKit Images section described to use
B_SYMBOL_TYPE_TEXT for symbol of function, not
B_SYMBOL_TYPE_CODE. Why ? */
/* strcat(init_fct_symname, "__Fv"); */ /* parameter nothing. */
/* "__Fv" dont need! The Be Book Bug ? */
err_stat = get_image_symbol(img_id, buf,
B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
if (err_stat != B_NO_ERROR) {
char real_name[MAXPATHLEN];
strlcpy(real_name, buf, MAXPATHLEN);
strlcat(real_name, "__Fv", MAXPATHLEN);
err_stat = get_image_symbol(img_id, real_name,
B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
}
if ((B_BAD_IMAGE_ID == err_stat) || (B_BAD_INDEX == err_stat)) {
unload_add_on(img_id);
dln_loaderror("Failed to lookup Init function %.200s", file);
}
else if (B_NO_ERROR != err_stat) {
char errmsg[] = "Internal of BeOS version. %.200s (symbol_name = %s)";
unload_add_on(img_id);
dln_loaderror(errmsg, strerror(err_stat), buf);
}
/* call module initialize function. */
(*init_fct)();
return (void*)img_id;
}
#endif /* __BEOS__ */
#ifndef DLN_DEFINED #ifndef DLN_DEFINED
dln_notimplement(); dln_notimplement();
#endif #endif

3
ext/extmk.rb
View file

@ -616,9 +616,6 @@ void Init_ext(void)\n{\n#$extinit}
open(extinit.c, "w") {|fe| fe.print src} open(extinit.c, "w") {|fe| fe.print src}
end end
if RUBY_PLATFORM =~ /beos/
$extflags.delete("-L/usr/local/lib")
end
$extpath.delete("$(topdir)") $extpath.delete("$(topdir)")
$extflags = libpathflag($extpath) << " " << $extflags.strip $extflags = libpathflag($extpath) << " " << $extflags.strip
conf = [ conf = [

4
ext/socket/basicsocket.c
View file

@ -244,7 +244,6 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
return INT2FIX(0); return INT2FIX(0);
} }
#if !defined(__BEOS__)
/* /*
* Document-method: getsockopt * Document-method: getsockopt
* call-seq: * call-seq:
@ -324,9 +323,6 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
return rsock_sockopt_new(family, level, option, rb_str_new(buf, len)); return rsock_sockopt_new(family, level, option, rb_str_new(buf, len));
} }
#else
#define bsock_getsockopt rb_f_notimplement
#endif
/* /*
* call-seq: * call-seq:

5
ext/socket/extconf.rb
View file

@ -435,9 +435,6 @@ when /mswin(32|64)|mingw/
have_library("ws2_32", "WSACleanup", headers) have_library("ws2_32", "WSACleanup", headers)
when /cygwin/ when /cygwin/
test_func = "socket(0,0,0)" test_func = "socket(0,0,0)"
when /beos/
test_func = "socket(0,0,0)"
have_library("net", "socket(0,0,0)", headers)
when /haiku/ when /haiku/
test_func = "socket(0,0,0)" test_func = "socket(0,0,0)"
have_library("network", "socket(0,0,0)", headers) have_library("network", "socket(0,0,0)", headers)
@ -507,7 +504,7 @@ EOF
end end
ipv6 = false ipv6 = false
default_ipv6 = /beos|haiku/ !~ RUBY_PLATFORM default_ipv6 = /haiku/ !~ RUBY_PLATFORM
if enable_config("ipv6", default_ipv6) if enable_config("ipv6", default_ipv6)
if checking_for("ipv6") {try_link(AF_INET6_SOCKET_CREATION_TEST)} if checking_for("ipv6") {try_link(AF_INET6_SOCKET_CREATION_TEST)}
$defs << "-DENABLE_IPV6" << "-DINET6" $defs << "-DENABLE_IPV6" << "-DINET6"

11
ext/socket/getaddrinfo.c
View file

@ -45,11 +45,7 @@
#include <sys/types.h> #include <sys/types.h>
#ifndef _WIN32 #ifndef _WIN32
#include <sys/param.h> #include <sys/param.h>
#if defined(__BEOS__) && !defined(BONE) #include <sys/socket.h>
# include <net/socket.h>
#else
# include <sys/socket.h>
#endif
#include <netinet/in.h> #include <netinet/in.h>
#if defined(HAVE_ARPA_INET_H) #if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h> #include <arpa/inet.h>
@ -439,11 +435,8 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
s = socket(afd->a_af, SOCK_DGRAM, 0); s = socket(afd->a_af, SOCK_DGRAM, 0);
if (s < 0) if (s < 0)
continue; continue;
#if defined(__BEOS__)
closesocket(s);
#else
close(s); close(s);
#endif
if (pai->ai_flags & AI_PASSIVE) { if (pai->ai_flags & AI_PASSIVE) {
GET_AI(cur->ai_next, afd, afd->a_addrany, port); GET_AI(cur->ai_next, afd, afd->a_addrany, port);

6
ext/socket/getnameinfo.c
View file

@ -41,11 +41,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef _WIN32 #ifndef _WIN32
#if defined(__BEOS__) && !defined(BONE) #include <sys/socket.h>
# include <net/socket.h>
#else
# include <sys/socket.h>
#endif
#include <netinet/in.h> #include <netinet/in.h>
#if defined(HAVE_ARPA_INET_H) #if defined(HAVE_ARPA_INET_H)
#include <arpa/inet.h> #include <arpa/inet.h>

11
ext/socket/rubysocket.h
View file

@ -27,11 +27,7 @@
# undef HAVE_TYPE_STRUCT_SOCKADDR_DL # undef HAVE_TYPE_STRUCT_SOCKADDR_DL
# endif # endif
#else #else
# if defined(__BEOS__) && !defined(BONE) # include <sys/socket.h>
# include <net/socket.h>
# else
# include <sys/socket.h>
# endif
# include <netinet/in.h> # include <netinet/in.h>
# ifdef HAVE_NETINET_IN_SYSTM_H # ifdef HAVE_NETINET_IN_SYSTM_H
# include <netinet/in_systm.h> # include <netinet/in_systm.h>
@ -222,11 +218,6 @@ typedef union {
# endif # endif
#endif #endif
#ifdef __BEOS__
# undef close
# define close closesocket
#endif
#define INET_CLIENT 0 #define INET_CLIENT 0
#define INET_SERVER 1 #define INET_SERVER 1
#define INET_SOCKS 2 #define INET_SOCKS 2

27
file.c
View file

@ -120,33 +120,6 @@ int flock(int, int);
#define STAT(p, s) stat((p), (s)) #define STAT(p, s) stat((p), (s))
#endif #endif
#if defined(__BEOS__) /* should not change ID if -1 */
static int
be_chown(const char *path, uid_t owner, gid_t group)
{
if (owner == (uid_t)-1 || group == (gid_t)-1) {
struct stat st;
if (STAT(path, &st) < 0) return -1;
if (owner == (uid_t)-1) owner = st.st_uid;
if (group == (gid_t)-1) group = st.st_gid;
}
return chown(path, owner, group);
}
#define chown be_chown
static int
be_fchown(int fd, uid_t owner, gid_t group)
{
if (owner == (uid_t)-1 || group == (gid_t)-1) {
struct stat st;
if (fstat(fd, &st) < 0) return -1;
if (owner == (uid_t)-1) owner = st.st_uid;
if (group == (gid_t)-1) group = st.st_gid;
}
return fchown(fd, owner, group);
}
#define fchown be_fchown
#endif /* __BEOS__ */
VALUE rb_cFile; VALUE rb_cFile;
VALUE rb_mFileTest; VALUE rb_mFileTest;
VALUE rb_cStat; VALUE rb_cStat;

4
include/ruby/defines.h
View file

@ -168,10 +168,6 @@ void xfree(void*);
#include "ruby/win32.h" #include "ruby/win32.h"
#endif #endif
#if defined(__BEOS__) && !defined(BONE)
#include <net/socket.h> /* intern.h needs fd_set definition */
#endif
#ifdef RUBY_EXPORT #ifdef RUBY_EXPORT
#undef RUBY_EXTERN #undef RUBY_EXTERN

10
io.c
View file

@ -35,7 +35,7 @@
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__BEOS__) #if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32)
# define NO_SAFE_RENAME # define NO_SAFE_RENAME
#endif #endif
@ -100,12 +100,6 @@
# include <sys/wait.h> /* for WNOHANG on BSD */ # include <sys/wait.h> /* for WNOHANG on BSD */
#endif #endif
#if defined(__BEOS__)
# ifndef NOFILE
# define NOFILE (OPEN_MAX)
# endif
#endif
#include "ruby/util.h" #include "ruby/util.h"
#ifndef O_ACCMODE #ifndef O_ACCMODE
@ -2188,7 +2182,7 @@ remain_size(rb_io_t *fptr)
off_t pos; off_t pos;
if (fstat(fptr->fd, &st) == 0 && S_ISREG(st.st_mode) if (fstat(fptr->fd, &st) == 0 && S_ISREG(st.st_mode)
#if defined(__BEOS__) || defined(__HAIKU__) #if defined(__HAIKU__)
&& (st.st_dev > 3) && (st.st_dev > 3)
#endif #endif
) )

1
lib/mkmf.rb
View file

@ -132,7 +132,6 @@ module MakeMakefile
$mingw = /mingw/ =~ RUBY_PLATFORM $mingw = /mingw/ =~ RUBY_PLATFORM
$cygwin = /cygwin/ =~ RUBY_PLATFORM $cygwin = /cygwin/ =~ RUBY_PLATFORM
$netbsd = /netbsd/ =~ RUBY_PLATFORM $netbsd = /netbsd/ =~ RUBY_PLATFORM
$beos = /beos/ =~ RUBY_PLATFORM
$haiku = /haiku/ =~ RUBY_PLATFORM $haiku = /haiku/ =~ RUBY_PLATFORM
$solaris = /solaris/ =~ RUBY_PLATFORM $solaris = /solaris/ =~ RUBY_PLATFORM
$universal = /universal/ =~ RUBY_PLATFORM $universal = /universal/ =~ RUBY_PLATFORM

4
signal.c
View file

@ -69,10 +69,6 @@ ruby_atomic_compare_and_swap(rb_atomic_t *ptr, rb_atomic_t cmp,
} }
#endif #endif
#if defined(__BEOS__)
#undef SIGBUS
#endif
#ifndef NSIG #ifndef NSIG
# define NSIG (_SIGMAX + 1) /* For QNX */ # define NSIG (_SIGMAX + 1) /* For QNX */
#endif #endif