ruby-changes:32690
From: nagachika <ko1@a...>
Date: Fri, 31 Jan 2014 00:58:37 +0900 (JST)
Subject: [ruby-changes:32690] nagachika:r44769 (ruby_2_0_0): merge revision(s) r44756: [Backport #r44402]
nagachika 2014-01-31 00:58:25 +0900 (Fri, 31 Jan 2014) New Revision: 44769 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44769 Log: merge revision(s) r44756: [Backport #r44402] * configure.in: use $@ instead of $(.TARGET) because .TARGET is not supported by GNU make. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/configure.in branches/ruby_2_0_0/version.h Index: ruby_2_0_0/configure.in =================================================================== --- ruby_2_0_0/configure.in (revision 44768) +++ ruby_2_0_0/configure.in (revision 44769) @@ -2341,7 +2341,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L2341 : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" - DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' + DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@' else test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' fi Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 44768) +++ ruby_2_0_0/ChangeLog (revision 44769) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Fri Jan 31 00:51:50 2014 Shugo Maeda <shugo@r...> + + * configure.in: use $@ instead of $(.TARGET) because .TARGET is not + supported by GNU make. + Fri Jan 31 00:49:41 2014 Yamashita Yuu <yamashita@g...> * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 44768) +++ ruby_2_0_0/version.h (revision 44769) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-01-31" -#define RUBY_PATCHLEVEL 390 +#define RUBY_PATCHLEVEL 391 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r44756 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/