diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-14 04:16:07 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-14 04:16:07 +0000 |
commit | 90dc4551510a8d608b81a93c4a6c9e211013ce30 (patch) | |
tree | 2a6f28d2a022984747e952552601e3ccb43810d8 | |
parent | 9c3d9bb6a4cad2c63d23ad4283c81da25db7c836 (diff) |
merge revision(s) 20573:
* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
is set. [ruby-talk:322136]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 8 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Dec 14 13:09:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG + is set. [ruby-talk:322136] + Mon Dec 14 12:53:56 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * lib/bigdecimal.rb: fix comparison operators [ruby-core:26646] diff --git a/configure.in b/configure.in index d922bd20da..307128cdf4 100644 --- a/configure.in +++ b/configure.in @@ -1113,7 +1113,6 @@ AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl STATIC= -: ${LIBPATHFLAG=' -L%s'} : ${PATHFLAG=''} if test "$with_dln_a_out" != yes; then @@ -1143,7 +1142,6 @@ if test "$with_dln_a_out" != yes; then [ --disable-rpath embed run path into extension libraries.], [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"]) if test "$enable_rpath" = yes; then - LIBPATHFLAG=" -L%1\$-s" RPATHFLAG=" ${linker_flag}-R%1\$-s" fi @@ -1265,6 +1263,12 @@ if test "$with_dln_a_out" != yes; then esac AC_MSG_RESULT($rb_cv_dlopen) fi +case ${RPATHFLAG} in +*'%1$'*) + : ${LIBPATHFLAG=' -L%1$-s'};; +*) + : ${LIBPATHFLAG=' -L%s'};; +esac AC_SUBST(LINK_SO) AC_SUBST(LIBPATHFLAG) AC_SUBST(RPATHFLAG) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-12-14" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091214 -#define RUBY_PATCHLEVEL 237 +#define RUBY_PATCHLEVEL 238 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |