1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-11-16 17:19:05 +00:00
parent 316b78a56d
commit 5c759e6b1c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Nov 17 02:19:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
Sat Nov 15 22:46:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Nov 15 22:46:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_reg_regsub): returns -1 unless ascii as well as * re.c (rb_reg_regsub): returns -1 unless ascii as well as

6
configure.in
View File

@ -1673,9 +1673,9 @@ ENABLE_SHARED=no
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
[ --enable-shared build a shared library for Ruby. ], [ --enable-shared build a shared library for Ruby. ],
[enable_shared=$enableval]) [enable_shared=$enableval])
LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
if test "$enable_shared" = 'yes'; then if test "$enable_shared" = 'yes'; then
LIBRUBY='$(LIBRUBY_SO)' LIBRUBY='$(LIBRUBY_SO)'
LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
LIBRUBYARG='$(LIBRUBYARG_SHARED)' LIBRUBYARG='$(LIBRUBYARG_SHARED)'
CFLAGS="$CFLAGS $CCDLFLAGS" CFLAGS="$CFLAGS $CCDLFLAGS"
ENABLE_SHARED=yes ENABLE_SHARED=yes
@ -1752,7 +1752,9 @@ if test "$enable_shared" = 'yes'; then
esac esac
fi fi
if test "$enable_rpath" = yes; then if test "$enable_rpath" = yes; then
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED" LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir)"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
fi fi
LDFLAGS="-L. $LDFLAGS" LDFLAGS="-L. $LDFLAGS"

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2008-11-15" #define RUBY_RELEASE_DATE "2008-11-17"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20081115 #define RUBY_RELEASE_CODE 20081117
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11
#define RUBY_RELEASE_DAY 15 #define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];