ruby-changes:4067
From: ko1@a...
Date: Thu, 21 Feb 2008 00:02:56 +0900 (JST)
Subject: [ruby-changes:4067] nobu - Ruby:r15557 (trunk, ruby_1_8): * configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
nobu 2008-02-21 00:01:36 +0900 (Thu, 21 Feb 2008)
New Revision: 15557
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/configure.in
branches/ruby_1_8/version.h
trunk/ChangeLog
trunk/configure.in
trunk/version.h
Log:
* configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
load path. [ruby-list:44600]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15557&r2=15556&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=15557&r2=15556&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15557&r2=15556&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15557&r2=15556&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15557&r2=15556&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15557&r2=15556&diff_format=u
Index: configure.in
===================================================================
--- configure.in (revision 15556)
+++ configure.in (revision 15557)
@@ -1084,11 +1084,23 @@
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 @@
*) : ${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
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15556)
+++ ChangeLog (revision 15557)
@@ -1,3 +1,8 @@
+Thu Feb 21 00:01:34 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * 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@r...>
* win32/win32.c (rb_w32_map_errno): exported.
Index: version.h
===================================================================
--- version.h (revision 15556)
+++ version.h (revision 15557)
@@ -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[];
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in (revision 15556)
+++ ruby_1_8/configure.in (revision 15557)
@@ -1054,11 +1054,23 @@
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'}
@@ -1168,14 +1180,6 @@
*) : ${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
AC_SUBST(LINK_SO)
AC_SUBST(LIBPATHFLAG)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 15556)
+++ ruby_1_8/ChangeLog (revision 15557)
@@ -1,3 +1,8 @@
+Thu Feb 21 00:01:34 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * 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@r...>
* win32/win32.c (rb_w32_map_errno): exported.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 15556)
+++ ruby_1_8/version.h (revision 15557)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-02-20"
+#define RUBY_RELEASE_DATE "2008-02-21"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080220
+#define RUBY_RELEASE_CODE 20080221
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#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[];
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/