[前][次][番号順一覧][スレッド一覧]

ruby-changes:24788

From: naruse <ko1@a...>
Date: Tue, 28 Aug 2012 20:05:33 +0900 (JST)
Subject: [ruby-changes:24788] naruse:r36839 (trunk): * configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4.

naruse	2012-08-28 20:05:23 +0900 (Tue, 28 Aug 2012)

  New Revision: 36839

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

  Log:
    * configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4.
      - omit ANSI standard flags to compile socket extension where
        anonymous union is required.
      - remove redundant -be flags.
      by Takashi Toyoshima <toyoshim@g...>
      https://github.com/ruby/ruby/pull/168

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 36838)
+++ configure.in	(revision 36839)
@@ -622,6 +622,11 @@
     [cygwin*|darwin*|netbsd*], [
       # need lgamma_r(), finite()
     ],
+    [haiku], [
+      # Haiku R1/alpha3 uses gcc-4.4.4 which can not handle anonymous union
+      # with ANSI standard flags. Anonumous union is required to compile
+      # socket extension where <net/if.h> uses anonymous union.
+    ],
     [
       # ANSI (no XCFLAGS because this is C only)
       RUBY_TRY_CFLAGS(-ansi -std=iso9899:199409, [
@@ -2294,11 +2299,11 @@
 			  [powerpc*], [
 			    : ${LDSHARED='$(LD) -xms'}
 			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
-			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+			    DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ],
 			  [i586*], [
 			    : ${LDSHARED='$(LD) -shared'}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
+			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lroot"
 			    ])
 			: ${LIBPATHENV=LIBRARY_PATH}
 			rb_cv_dlopen=yes ],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36838)
+++ ChangeLog	(revision 36839)
@@ -1,3 +1,12 @@
+Tue Aug 28 20:03:54 2012  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4.
+	  - omit ANSI standard flags to compile socket extension where
+	    anonymous union is required.
+	  - remove redundant -be flags.
+	  by Takashi Toyoshima <toyoshim@g...>
+	  https://github.com/ruby/ruby/pull/168
+
 Tue Aug 28 11:32:37 2012  Yuki Yugui Sonoda  <yugui@g...>
 
 	* nacl/GNUmakefile.in (.rbconfig.time): r36828 was incomplete.

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

[前][次][番号順一覧][スレッド一覧]