[前][次][番号順一覧][スレッド一覧]

ruby-changes:24521

From: nobu <ko1@a...>
Date: Mon, 30 Jul 2012 13:11:33 +0900 (JST)
Subject: [ruby-changes:24521] nobu:r36572 (trunk): configure.in: runnable if disable-shared

nobu	2012-07-30 13:11:21 +0900 (Mon, 30 Jul 2012)

  New Revision: 36572

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36572

  Log:
    configure.in: runnable if disable-shared
    
    * configure.in (LIBRUBY_RELATIVE): libruby_so is not made when
      disable-shared, so no absolute path is used for it and executable
      file is runnable anywhere.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 36571)
+++ configure.in	(revision 36572)
@@ -2405,10 +2405,13 @@
     AC_CHECK_FUNCS(dladdr)
     if test "$ac_cv_func_dladdr" = yes; then
 	LOAD_RELATIVE=1
-    else
-	unset load_relative
     fi
 fi
+if test x"$LOAD_RELATIVE" = x1; then
+    load_relative=yes
+else
+    unset load_relative
+fi
 
 len=2 # .rb
 n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
@@ -2542,11 +2545,12 @@
        AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
        [enable_shared=$enableval])
 libprefix='$(libdir)'
-LIBRUBY_RELATIVE=no
+LIBRUBY_RELATIVE=${load_relative-no}
 AS_CASE("$enable_shared", [yes], [
   LIBRUBY='$(LIBRUBY_SO)'
   LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
   LIBRUBYARG='$(LIBRUBYARG_SHARED)'
+  LIBRUBY_RELATIVE=no
   test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
   ENABLE_SHARED=yes
   if test "$rb_cv_binary_elf" = yes; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36571)
+++ ChangeLog	(revision 36572)
@@ -1,3 +1,9 @@
+Mon Jul 30 13:11:20 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBRUBY_RELATIVE): libruby_so is not made when
+	  disable-shared, so no absolute path is used for it and executable
+	  file is runnable anywhere.
+
 Mon Jul 30 01:30:10 2012  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* common.mk: add a dependency. [ruby-core:46741] [Bug #6789]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]