diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:16:15 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-17 13:16:15 +0000 |
| commit | c503b659ca5e44cdbece8b3cbe5bb3fb941c3bc3 (patch) | |
| tree | b099a79626a62aec19cee9e5791232c2da53b469 | |
| parent | 0a4ca8cfe82fb073aee6b7364315cbacd756446e (diff) | |
merge revision(s) 12205:
* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
it is done by libpathflag in mkmf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Tue Jun 17 22:14:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted, + it is done by libpathflag in mkmf.rb. + Mon Jun 16 19:18:35 2008 NAKAMURA Usaku <usa@ruby-lang.org> * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS. diff --git a/configure.in b/configure.in index e31a6fec49..849b10ab73 100644 --- a/configure.in +++ b/configure.in @@ -936,7 +936,7 @@ AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl STATIC= -: ${LIBPATHFLAG=' -L"%s"'} +: ${LIBPATHFLAG=' -L%s'} : ${PATHFLAG=''} if test "$with_dln_a_out" != yes; then @@ -1000,7 +1000,7 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes ;; interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" - LIBPATHFLAG=" -L'%1\$-s'" + LIBPATHFLAG=" -L%1\$-s" rb_cv_dlopen=yes ;; freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"} if test "$rb_cv_binary_elf" = yes; then @@ -1081,11 +1081,11 @@ 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'" + LIBPATHFLAG=" -L%1\$-s" if test "$GCC" = yes; then - RPATHFLAG=" -Wl,-R'%1\$-s'" + RPATHFLAG=" -Wl,-R%1\$-s" else - RPATHFLAG=" -R'%1\$-s'" + RPATHFLAG=" -R%1\$-s" fi fi fi @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2008-06-16" +#define RUBY_RELEASE_DATE "2008-06-17" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20080616 -#define RUBY_PATCHLEVEL 223 +#define RUBY_RELEASE_CODE 20080617 +#define RUBY_PATCHLEVEL 224 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |