naruse	2014-02-17 06:28:55 +0900 (Mon, 17 Feb 2014)

  New Revision: 45017

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

  Log:
    merge revision(s) 44476: [Backport #9317]
    
    * configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after
      LIBPATHFLAG and RPATHFLAG are set.  [ruby-dev:47868] [Bug #9317]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 45016)
+++ ruby_2_1/configure.in	(revision 45017)
@@ -880,17 +880,11 @@ AC_ARG_WITH(opt-dir, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L880
 	[
 		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
 		CPPFLAGS="$CPPFLAGS $val"
-		val=`IFS="$PATH_SEPARATOR"
-		    for dir in $withval; do
-			echo x ${LIBPATHFLAG} ${RPATHFLAG} |
-			sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
-		    done | tr '\012' ' '`
+		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib|g;s/^ //"`
+		LDFLAGS="$LDFLAGS $val"
 		LDFLAGS_OPTDIR="$val"
-		test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
-		LDFLAGS="$LDFLAGS$val"
-		test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
-		DLDFLAGS="$DLDFLAGS$val"
-	])
+		OPT_DIR="$withval"
+	], [OPT_DIR=])
 
 test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
 test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
@@ -2777,6 +2771,21 @@ AC_SUBST(RPATHFLAG) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2771
 AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
 AC_SUBST(TRY_LINK)
 
+if test "x$OPT_DIR" != x; then
+    pat=`echo "${LDFLAGS_OPTDIR}" | sed ['s/[][\\.*|]/\\\\&/']`
+    LDFLAGS=`echo "${LDFLAGS}" | sed "s| ${pat}||"`
+    val=`IFS="$PATH_SEPARATOR"
+        for dir in $OPT_DIR; do
+            echo x ${LIBPATHFLAG} ${RPATHFLAG} |
+            sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
+        done | tr '\012' ' '`
+    test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
+    LDFLAGS="$LDFLAGS$val"
+    test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
+    DLDFLAGS="$DLDFLAGS$val"
+    LDFLAGS_OPTDIR="$val"
+fi
+
 AS_CASE(["$target_cpu-$target_os"],
 [*-darwin*], [
     AC_CHECK_HEADERS([execinfo.h])
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45016)
+++ ruby_2_1/ChangeLog	(revision 45017)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Feb 17 05:43:20 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after
+	  LIBPATHFLAG and RPATHFLAG are set.  [ruby-dev:47868] [Bug #9317]
+
 Sun Feb 16 07:13:36 2014  Tanaka Akira  <akr@f...>
 
 	* configure.in: Fix compilation error.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45016)
+++ ruby_2_1/version.h	(revision 45017)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-02-16"
-#define RUBY_PATCHLEVEL 31
+#define RUBY_RELEASE_DATE "2014-02-17"
+#define RUBY_PATCHLEVEL 32
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44476


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