archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

configure.in: clock_gettime

Browse source 
* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-18 03:41:56 +00:00
parent 364237623b
commit e7ad242663
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Aug 18 12:41:50 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@fsij.org> Sun Aug 18 10:05:12 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_big2str1): Make an expression more explicit. * bignum.c (rb_big2str1): Make an expression more explicit.

9
configure.in
View file

@ -1748,7 +1748,6 @@ AC_CHECK_FUNCS(_setjmp) # used for AC_ARG_WITH(setjmp-type)
AC_CHECK_FUNCS(_setjmpex) # used for AC_ARG_WITH(setjmp-type) AC_CHECK_FUNCS(_setjmpex) # used for AC_ARG_WITH(setjmp-type)
AC_CHECK_FUNCS(chroot) AC_CHECK_FUNCS(chroot)
AC_CHECK_FUNCS(chsize) AC_CHECK_FUNCS(chsize)
AC_CHECK_FUNCS(clock_gettime)
AC_CHECK_FUNCS(cosh) AC_CHECK_FUNCS(cosh)
AC_CHECK_FUNCS(daemon) AC_CHECK_FUNCS(daemon)
AC_CHECK_FUNCS(dl_iterate_phdr) AC_CHECK_FUNCS(dl_iterate_phdr)
@ -1856,13 +1855,13 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
# Some platform need -lrt for clock_gettime, but the other don't. # 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. # glibc 2.17 moves clock_* functions from librt to the main C library.
# http://sourceware.org/ml/libc-announce/2012/msg00001.html # http://sourceware.org/ml/libc-announce/2012/msg00001.html
AC_CHECK_LIB(rt, clock_gettime) ac_cv_func_clock_gettime="$ac_cv_lib_rt_clock_gettime"
unset ac_cv_func_clock_gettime
AC_CHECK_FUNCS(clock_gettime)
fi fi
AC_CHECK_FUNCS(clock_gettime)
AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value, AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
[AC_TRY_COMPILE([ [AC_TRY_COMPILE([