naruse	2012-08-23 11:59:24 +0900 (Thu, 23 Aug 2012)

  New Revision: 36791

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36791

  Log:
    * configure.in: Fixing Haiku build.
      - -lbe is not required for linking
      - stack protector doesn't work for now because of the default gcc's bug
      by Takashi Toyoshima <toyoshim@g...>
      https://github.com/ruby/ruby/pull/167
    
    * signal.c (ruby_signal): haiku doesn't have SIGBUS.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/signal.c

Index: configure.in
===================================================================
--- configure.in	(revision 36790)
+++ configure.in	(revision 36791)
@@ -601,7 +601,7 @@
 
     # -fstack-protector
     AS_CASE(["$target_os"],
-    [mingw*|nacl], [
+    [mingw*|nacl|haiku], [
 	stack_protector=no
     ],
     [
@@ -2289,8 +2289,8 @@
 			    ],
 			  [i586*], [
 			    : ${LDSHARED='$(LD) -shared'}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
-			    LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
+			    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],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36790)
+++ ChangeLog	(revision 36791)
@@ -1,3 +1,13 @@
+Thu Aug 23 11:52:04 2012  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: Fixing Haiku build.
+	  - -lbe is not required for linking
+	  - stack protector doesn't work for now because of the default gcc's bug
+	  by Takashi Toyoshima <toyoshim@g...>
+	  https://github.com/ruby/ruby/pull/167
+
+	* signal.c (ruby_signal): haiku doesn't have SIGBUS.
+
 Thu Aug 23 11:32:44 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/open-uri/test_open-uri.rb (TestOpenURI#test_read_timeout): this
Index: signal.c
===================================================================
--- signal.c	(revision 36790)
+++ signal.c	(revision 36791)
@@ -463,7 +463,11 @@
 	sigact.sa_flags |= SA_NOCLDWAIT;
 #endif
 #if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
-    if (signum == SIGSEGV || signum == SIGBUS)
+    if (signum == SIGSEGV
+#ifdef SIGBUS
+	|| signum == SIGBUS
+#endif
+       )
 	sigact.sa_flags |= SA_ONSTACK;
 #endif
     if (sigaction(signum, &sigact, &old) < 0) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/