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

ruby-changes:30525

From: nobu <ko1@a...>
Date: Sun, 18 Aug 2013 12:42:02 +0900 (JST)
Subject: [ruby-changes:30525] nobu:r42604 (trunk): configure.in: clock_gettime

nobu	2013-08-18 12:41:56 +0900 (Sun, 18 Aug 2013)

  New Revision: 42604

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

  Log:
    configure.in: clock_gettime
    
    * configure.in (clock_gettime): need to check with -lrt prior to check
      for the function only.  otherwise -lrt is not linked and the link
      fails, when ac_cv_func_clock_gettime is cached as yes.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 42603)
+++ configure.in	(revision 42604)
@@ -1748,7 +1748,6 @@ 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)
@@ -1856,13 +1855,13 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, https://github.com/ruby/ruby/blob/trunk/configure.in#L1855
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
 
 # Some platform need -lrt for clock_gettime, but the other don't.
-if test x"$ac_cv_func_clock_gettime" != xyes; then
+AC_CHECK_LIB(rt, clock_gettime)
+if test x"$ac_cv_lib_rt_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_CHECK_LIB(rt, clock_gettime)
-    unset ac_cv_func_clock_gettime
-    AC_CHECK_FUNCS(clock_gettime)
+    ac_cv_func_clock_gettime="$ac_cv_lib_rt_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 42603)
+++ ChangeLog	(revision 42604)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Aug 18 12:41:50 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (clock_gettime): need to check with -lrt prior to check
+	  for the function only.  otherwise -lrt is not linked and the link
+	  fails, when ac_cv_func_clock_gettime is cached as yes.
+
 Sun Aug 18 10:05:12 2013  Tanaka Akira  <akr@f...>
 
 	* bignum.c (rb_big2str1): Make an expression more explicit.

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

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