nobu	2012-07-18 14:53:23 +0900 (Wed, 18 Jul 2012)

  New Revision: 36432

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

  Log:
    configure.in: EXTDLDFLAGS
    
    * configure.in (EXTDLDFLAGS): split options for each extension
      libraries, and unused in ruby.pc.  [Bug #6734]
    * lib/mkmf.rb (MakeMakefile#configuration): add EXTDLDFLAGS.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/lib/mkmf.rb

Index: configure.in
===================================================================
--- configure.in	(revision 36431)
+++ configure.in	(revision 36432)
@@ -2282,7 +2282,7 @@
 			rb_cv_dlopen=yes],
         [aix*], [	: ${LDSHARED='$(CC)'}
 			LDSHARED="$LDSHARED ${linker_flag}-G"
-			DLDFLAGS='-e$(TARGET_ENTRY)'
+			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
 			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
 			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
 			: ${ARCHFILE="ruby.imp"}
@@ -2294,7 +2294,8 @@
 	[beos*], [	AS_CASE(["$target_cpu"],
 			  [powerpc*], [
 			    : ${LDSHARED='$(LD) -xms'}
-			    DLDFLAGS="$DLDFLAGS "'-export $(TARGET_ENTRY) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
+			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
 			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
 			    ],
 			  [i586*], [
@@ -2307,7 +2308,8 @@
 	[haiku*], [	AS_CASE(["$target_cpu"],
 			  [powerpc*], [
 			    : ${LDSHARED='$(LD) -xms'}
-			    DLDFLAGS="$DLDFLAGS "'-export $(TARGET_ENTRY) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
+			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ],
 			  [i586*], [
 			    : ${LDSHARED='$(LD) -shared'}
@@ -2928,6 +2930,7 @@
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(EXTLDFLAGS)dnl
+AC_SUBST(EXTDLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
 AC_SUBST(LIBRUBY_DLDFLAGS)
 AC_SUBST(RUBY_INSTALL_NAME)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36431)
+++ ChangeLog	(revision 36432)
@@ -1,3 +1,10 @@
+Wed Jul 18 14:53:21 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (EXTDLDFLAGS): split options for each extension
+	  libraries, and unused in ruby.pc.  [Bug #6734]
+
+	* lib/mkmf.rb (MakeMakefile#configuration): add EXTDLDFLAGS.
+
 Wed Jul 18 14:47:23 2012  Koichi Sasada  <ko1@a...>
 
 	* thread.c: fix last commit miss.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 36431)
+++ lib/mkmf.rb	(revision 36432)
@@ -1795,7 +1795,7 @@
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
 CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
 ldflags  = #{$LDFLAGS}
-dldflags = #{$DLDFLAGS}
+dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
 ARCH_FLAG = #{$ARCH_FLAG}
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = #{CONFIG['LDSHARED']}

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