diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 20 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 20 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Thu Feb 21 00:01:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime + load path. [ruby-list:44600] + Wed Feb 20 23:55:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/win32.c (rb_w32_map_errno): exported. diff --git a/configure.in b/configure.in index 88e25a7cdf..c17821011f 100644 --- a/configure.in +++ b/configure.in @@ -1084,11 +1084,23 @@ if test "$with_dln_a_out" != yes; then esac fi + + AC_ARG_ENABLE(rpath, + [ --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 + case "$target_os" in hpux*) DLDFLAGS="$DLDFLAGS -E" : ${LDSHARED='ld -b'} XLDFLAGS="$XLDFLAGS -Wl,-E" : ${LIBPATHENV=SHLIB_PATH} + if test "$rb_cv_prog_gnu_ld" = no; then + RPATHFLAG=' +b %1$-s' + fi rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then : ${LDSHARED='$(CC) -shared'} @@ -1198,14 +1210,6 @@ if test "$with_dln_a_out" != yes; then *) : ${LDSHARED='ld'} ;; esac AC_MSG_RESULT($rb_cv_dlopen) - - AC_ARG_ENABLE(rpath, - [ --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 fi if test "${LDSHAREDXX}" = ""; then case "${LDSHARED}" in @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-02-20" +#define RUBY_RELEASE_DATE "2008-02-21" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080220 +#define RUBY_RELEASE_CODE 20080221 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |