diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-05 02:38:51 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-05 02:38:51 +0000 |
| commit | b2a2fa42960c90d825b5ffad32d4331d0145b8f5 (patch) | |
| tree | 285659265f1af72632548bd219f53465753fd4e7 | |
| parent | c04e6e6e61a4e9c52647c2afee24da28174d5e8c (diff) | |
merge revision(s) 37905: [Backport #8757]
* configure.in (opt-dir): don't use non portable flag -E of sed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Wed Feb 5 11:36:30 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * configure.in (opt-dir): don't use non portable flag -E of sed. + Thu Jan 30 20:53:42 2014 Tanaka Akira <akr@fsij.org> * ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because diff --git a/configure.in b/configure.in index e35ecac95d..549914edcb 100644 --- a/configure.in +++ b/configure.in @@ -2928,7 +2928,7 @@ AC_ARG_WITH(opt-dir, val=`IFS="$PATH_SEPARATOR" for dir in $withval; do echo x ${LIBPATHFLAG} ${RPATHFLAG} | - sed -E 's/^x *//;s'"${PATH_SEPARATOR}"'%1\\$-s|%s'"${IFS}${dir}/lib${IFS}g" + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" done | tr '\012' ' '` set +x LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val" @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 511 +#define RUBY_PATCHLEVEL 512 -#define RUBY_RELEASE_DATE "2014-01-31" +#define RUBY_RELEASE_DATE "2014-02-05" #define RUBY_RELEASE_YEAR 2014 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 5 #include "ruby/version.h" |