nobu	2009-08-25 02:16:40 +0900 (Tue, 25 Aug 2009)

  New Revision: 24642

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

  Log:
    * configure.in (DLDFLAGS): use linker_flag and changed undefined
      and multiply_defined behaviors. cf [ruby-core:25086].

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/version.h

Index: configure.in
===================================================================
--- configure.in	(revision 24641)
+++ configure.in	(revision 24642)
@@ -1723,7 +1723,8 @@
 	when(rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
 			: ${LDFLAGS=""}
 			rb_cv_dlopen=yes ;;
-	when(darwin*)	: ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress -flat_namespace'}
+	when(darwin*)	: ${LDSHARED='$(CC) -dynamic -bundle'}
+			: ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"}
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
 			# /usr/local/include is always searched for
@@ -2049,13 +2050,13 @@
 	;;
     when(darwin*)
 	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_LDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace'
+	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
 	if test "$load_relative" = yes; then
 	    libprefix='@executable_path/../lib'
 	else
 	    libprefix='$(libdir)'
 	fi
-	LIBRUBY_DLDFLAGS='-install_name '${libprefix}'/$(LIBRUBY_SO)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_* $(XLDFLAGS)'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24641)
+++ ChangeLog	(revision 24642)
@@ -1,3 +1,8 @@
+Tue Aug 25 02:16:37 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (DLDFLAGS): use linker_flag and changed undefined
+	  and multiply_defined behaviors. cf [ruby-core:25086].
+
 Mon Aug 24 21:31:37 2009  Kouhei Sutou  <kou@c...>
 
 	* lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: fix a bug
Index: version.h
===================================================================
--- version.h	(revision 24641)
+++ version.h	(revision 24642)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-08-24"
+#define RUBY_RELEASE_DATE "2009-08-25"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 

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