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

* configure.in: fixed build failure of Haiku.

Browse source 
[fix GH-984] Patch by @kallisti5
* ext/socket/getaddrinfo.c: ditto.
* ext/socket/getnameinfo.c: ditto.
* ext/socket/rubysocket.h: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-10-24 13:51:25 +00:00
parent 96ff94c95d
commit 5d5315ad3b
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sat Oct 24 22:51:18 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* configure.in: fixed build failure of Haiku.
[fix GH-984] Patch by @kallisti5
* ext/socket/getaddrinfo.c: ditto.
* ext/socket/getnameinfo.c: ditto.
* ext/socket/rubysocket.h: ditto.
Sat Oct 24 21:16:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Oct 24 21:16:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/fileutils/test_fileutils.rb (test_uptodate): relax error * test/fileutils/test_fileutils.rb (test_uptodate): relax error

13
configure.in
View file

@ -3055,7 +3055,7 @@ if test "$with_dln_a_out" != yes; then
[bsdi3*], [ AS_CASE(["$CC"], [bsdi3*], [ AS_CASE(["$CC"],
[*shlicc*], [ : ${LDSHARED='$(CC) -r'} [*shlicc*], [ : ${LDSHARED='$(CC) -r'}
rb_cv_dlopen=yes])], rb_cv_dlopen=yes])],
[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED='$(CC) -shared'}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic" LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@ -3109,17 +3109,6 @@ if test "$with_dln_a_out" != yes; then
]) ])
: ${LIBPATHENV=LIBRARY_PATH} : ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[haiku*], [ AS_CASE(["$target_cpu"],
[powerpc*], [
: ${LDSHARED='$(LD) -xms'}
EXTDLDFLAGS='-export $(TARGET_ENTRY)'
DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
],
[i586*], [
: ${LDSHARED='$(CC) -shared'}
])
: ${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"

2
ext/socket/getaddrinfo.c
View file

@ -45,7 +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(__HAIKU__) && !defined(BONE) #if defined(__BEOS__) && !defined(BONE)
# include <net/socket.h> # include <net/socket.h>
#else #else
# include <sys/socket.h> # include <sys/socket.h>

2
ext/socket/getnameinfo.c
View file

@ -41,7 +41,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef _WIN32 #ifndef _WIN32
#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE) #if defined(__BEOS__) && !defined(BONE)
# include <net/socket.h> # include <net/socket.h>
#else #else
# include <sys/socket.h> # include <sys/socket.h>

3
ext/socket/rubysocket.h
View file

@ -80,6 +80,9 @@
#endif #endif
#ifdef HAVE_IFADDRS_H #ifdef HAVE_IFADDRS_H
# ifdef __HAIKU__
# define _BSD_SOURCE
# endif
# include <ifaddrs.h> # include <ifaddrs.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H