kanemoto	2009-11-13 01:01:28 +0900 (Fri, 13 Nov 2009)

  New Revision: 25740

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

  Log:
    merges r24482, r25061, r25124, r25126, r25552 from trunk into ruby_1_9_1.
    
    These patches are for AIX compilation issues. This commit is allowed by
    branch master (yugui). Thanks!
    
    * ext/socket/extconf.rb : Compilation failure on AIX.
      ss_len (a member of struct sockaddr_storage) has preceding __,
      but ss_family does not have it from AIX 5.2.
    
    * Makefile.in (miniruby): suppress duplication warning on AIX.
    
    * common.mk (ruby.imp): add text section [Bug #2064].
    
    * common.mk (ruby.imp): do not export Init_*.
    
    * dln.c (aix_loaderror): fixed typo. suppress warnings.
    
    * common.mk (ruby.imp): excluded prelude.o to get rid of circular
      dependency.  [ruby-dev:39052]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/common.mk
    branches/ruby_1_9_1/dln.c
    branches/ruby_1_9_1/ext/socket/extconf.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25739)
+++ ruby_1_9_1/ChangeLog	(revision 25740)
@@ -1,3 +1,28 @@
+Thu Oct 29 01:22:01 2009  Yutaka Kanemoto  <kanemoto@r...>
+
+	* ext/socket/extconf.rb : Compilation failure on AIX.
+	  ss_len (a member of struct sockaddr_storage) has preceding __,
+	  but ss_family does not have it from AIX 5.2.
+
+Mon Sep 28 01:28:17 2009  Yutaka Kanemoto  <kanemoto@r...>
+
+	* Makefile.in (miniruby): suppress duplication warning on AIX.
+
+Mon Sep 28 01:13:25 2009  Yutaka Kanemoto  <kanemoto@r...>
+
+	* common.mk (ruby.imp): add text section [Bug #2064].
+
+	* common.mk (ruby.imp): do not export Init_*.
+
+Thu Sep 24 01:14:18 2009  Yutaka Kanemoto  <kanemoto@r...>
+
+	* dln.c (aix_loaderror): fixed typo. suppress warnings.
+
+Sun Aug  9 16:36:51 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (ruby.imp): excluded prelude.o to get rid of circular
+	  dependency.  [ruby-dev:39052]
+
 Thu Sep 17 06:03:40 2009  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* lib/matrix.rb (Matrix#rank): Two bug fixes. One made
Index: ruby_1_9_1/common.mk
===================================================================
--- ruby_1_9_1/common.mk	(revision 25739)
+++ ruby_1_9_1/common.mk	(revision 25740)
@@ -85,11 +85,12 @@
 		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
 
-OBJS          = dln.$(OBJEXT) \
+EXPORTOBJS    = dln.$(OBJEXT) \
 		encoding.$(OBJEXT) \
-		prelude.$(OBJEXT) \
 		$(COMMONOBJS)
 
+OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
+
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
 PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
@@ -160,8 +161,10 @@
 	@$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(EXPORTOBJS)
+	@$(NM) -Pgp $(EXPORTOBJS) | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|\.)/{print $$1}' | \
+	sort -u -o $@
 
 install: install-nodoc $(RDOCTARGET)
 install-all: install-nodoc install-doc
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 25739)
+++ ruby_1_9_1/Makefile.in	(revision 25740)
@@ -134,7 +134,7 @@
 
 miniruby$(EXEEXT):
 		@-if test -f $@; then mv -f $@ $@.old; $(RM) $@.old; fi
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
Index: ruby_1_9_1/dln.c
===================================================================
--- ruby_1_9_1/dln.c	(revision 25739)
+++ ruby_1_9_1/dln.c	(revision 25740)
@@ -1100,6 +1100,7 @@
 #include <windows.h>
 #endif
 
+#if ! defined _AIX
 static const char *
 dln_strerror(void)
 {
@@ -1149,8 +1150,8 @@
     return message;
 #endif
 }
+#endif
 
-
 #if defined(_AIX) && ! defined(_IA64)
 static void
 aix_loaderror(const char *pathname)
@@ -1160,7 +1161,7 @@
 
     static const struct errtab {
 	int errnum;
-	char *errstr;
+	const char * errstr;
     } load_errtab[] = {
 	{L_ERROR_TOOMANY,	"too many errors, rest skipped."},
 	{L_ERROR_NOLIB,		"can't load library:"},
@@ -1182,7 +1183,7 @@
     snprintf(errbuf, sizeof(errbuf), "load failed - %s ", pathname);
 
     message[0] = NULL;
-    if (!loadquery(L_GETMESSAGE, &message[0], sizeof(message)))
+    if (!loadquery(L_GETMESSAGES, &message[0], sizeof(message)))
 	ERRBUF_APPEND(strerror(errno));
     for(i = 0; message[i] && *message[i]; i++) {
 	int nerr = atoi(message[i]);
Index: ruby_1_9_1/ext/socket/extconf.rb
===================================================================
--- ruby_1_9_1/ext/socket/extconf.rb	(revision 25739)
+++ ruby_1_9_1/ext/socket/extconf.rb	(revision 25740)
@@ -92,8 +92,10 @@
 #   doug's fix, NOW add -Dss_family... only if required!
 doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
 if (doug[] or
-    with_cppflags($CPPFLAGS + " -Dss_family=__ss_family -Dss_len=__ss_len", &doug))
+    with_cppflags($CPPFLAGS + " -Dss_family=__ss_family", &doug))
   $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
+  doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)}
+  doug[] or with_cppflags($CPPFLAGS + " -Dss_len=__ss_len", &doug)
 end
 
 if have_struct_member("struct sockaddr", "sa_len", headers)

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