1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: Revert r42604. It causes linking librt on systems

Browse Source 
with newer glibc uselessly.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-08-18 05:26:47 +00:00
parent 2a47ee5e78
commit 5da36600a1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Aug 18 14:22:45 2013 Tanaka Akira <akr@fsij.org>
* configure.in: Revert r42604. It causes linking librt on systems
with newer glibc uselessly.
Sun Aug 18 13:18:38 2013 Tanaka Akira <akr@fsij.org> Sun Aug 18 13:18:38 2013 Tanaka Akira <akr@fsij.org>
* process.c (Init_process): Add constants: CLOCK_REALTIME_COARSE, * process.c (Init_process): Add constants: CLOCK_REALTIME_COARSE,

9
configure.in
View File

@ -1748,6 +1748,7 @@ 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)
@ -1855,13 +1856,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.
AC_CHECK_LIB(rt, clock_gettime) if test x"$ac_cv_func_clock_gettime" != xyes; then
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_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 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([