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

ruby-changes:30527

From: akr <ko1@a...>
Date: Sun, 18 Aug 2013 14:26:55 +0900 (JST)
Subject: [ruby-changes:30527] akr:r42606 (trunk): * configure.in: Revert r42604. It causes linking librt on systems

akr	2013-08-18 14:26:47 +0900 (Sun, 18 Aug 2013)

  New Revision: 42606

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

  Log:
    * configure.in: Revert r42604.  It causes linking librt on systems
      with newer glibc uselessly.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 42605)
+++ configure.in	(revision 42606)
@@ -1748,6 +1748,7 @@ AC_CHECK_FUNCS(_setjmp)			# used for AC_ https://github.com/ruby/ruby/blob/trunk/configure.in#L1748
 AC_CHECK_FUNCS(_setjmpex)		# used for AC_ARG_WITH(setjmp-type)
 AC_CHECK_FUNCS(chroot)
 AC_CHECK_FUNCS(chsize)
+AC_CHECK_FUNCS(clock_gettime)
 AC_CHECK_FUNCS(cosh)
 AC_CHECK_FUNCS(daemon)
 AC_CHECK_FUNCS(dl_iterate_phdr)
@@ -1855,13 +1856,13 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, https://github.com/ruby/ruby/blob/trunk/configure.in#L1856
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
 
 # Some platform need -lrt for clock_gettime, but the other don't.
-AC_CHECK_LIB(rt, clock_gettime)
-if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
+if test x"$ac_cv_func_clock_gettime" != xyes; then
     # glibc 2.17 moves clock_* functions from librt to the main C library.
     # http://sourceware.org/ml/libc-announce/2012/msg00001.html
-    ac_cv_func_clock_gettime="$ac_cv_lib_rt_clock_gettime"
+    AC_CHECK_LIB(rt, clock_gettime)
+    unset ac_cv_func_clock_gettime
+    AC_CHECK_FUNCS(clock_gettime)
 fi
-AC_CHECK_FUNCS(clock_gettime)
 
 AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
   [AC_TRY_COMPILE([
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42605)
+++ ChangeLog	(revision 42606)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Aug 18 14:22:45 2013  Tanaka Akira  <akr@f...>
+
+	* configure.in: Revert r42604.  It causes linking librt on systems
+	  with newer glibc uselessly.
+
 Sun Aug 18 13:18:38 2013  Tanaka Akira  <akr@f...>
 
 	* process.c (Init_process): Add constants: CLOCK_REALTIME_COARSE,

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

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