Bug 149003 - [patch] lang/ruby18, lang/ruby19: drop librt dep, clock_gettime() and nanosleep() are within libc
[patch] lang/ruby18, lang/ruby19: drop librt dep, clock_gettime() and nanosle...
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Stanislav Sedov
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2010-07-27 17:20 UTC by swell.k
Modified: 2010-10-11 07:43 UTC (History)
0 users

See Also:


Attachments
a.diff (1.86 KB, patch)
2010-07-27 17:20 UTC, swell.k
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description swell.k 2010-07-27 17:20:01 UTC

    
Comment 1 Edwin Groothuis freebsd_committer 2010-07-27 17:20:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->stas

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 swell.k 2010-07-27 21:22:36 UTC
Here is a patch against trunk. I don't have Linux around to test, though.
It should look like

  checking for library containing clock_gettime... none required

or

  checking for library containing clock_gettime... -lrt

--- a.diff begins here ---
Index: configure.in
===================================================================
--- configure.in	(revision 28767)
+++ configure.in	(working copy)
@@ -974,7 +973,7 @@
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
 AC_CHECK_LIB(socket, socketpair)	# SunOS/Solaris
-AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
+AC_SEARCH_LIBS(clock_gettime, rt)	# GNU/Linux
 if test "${enable_win95}" = maybe; then
     AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
 fi
@@ -1610,8 +1609,8 @@
 	pthread_get_stackaddr_np pthread_get_stacksize_np \
 	thr_stksegment pthread_stackseg_np pthread_getthrds_np)
     if test x"$ac_cv_func_nanosleep" = xno; then
-       AC_CHECK_LIB(rt, nanosleep)
-       if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
+       AC_SEARCH_LIBS(nanosleep, rt)
+       if test x"$ac_cv_search_nanosleep" != xno; then
            AC_DEFINE(HAVE_NANOSLEEP)
        fi
     fi
--- a.diff ends here ---
Comment 3 dfilter freebsd_committer 2010-10-11 04:09:59 UTC
stas        2010-10-11 03:09:54 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.ruby.mk 
    lang/ruby19          Makefile distinfo pkg-plist 
  Added files:
    lang/ruby19/files    patch-common.mk patch-configure.in 
                         patch-thread_pthread.c 
  Removed files:
    lang/ruby19/files    patch-configure 
                         patch-ext_readline_readline.c 
                         patch-gem_prelude.rb patch-io.c 
                         patch-mkconfig.rb patch-ssl1.0-compat 
  Log:
  - Update ruby19 to 1.9.2.
  - Do not link agains librt. [1]
  
  PR:             ports/149003 [1]
  Submitted by:   Anonymous <swell.k@gmail.com> [1]
  
  Revision  Changes    Path
  1.201     +8 -5      ports/Mk/bsd.ruby.mk
  1.8       +48 -15    ports/lang/ruby19/Makefile
  1.8       +3 -3      ports/lang/ruby19/distinfo
  1.1       +11 -0     ports/lang/ruby19/files/patch-common.mk (new)
  1.4       +0 -20     ports/lang/ruby19/files/patch-configure (dead)
  1.1       +46 -0     ports/lang/ruby19/files/patch-configure.in (new)
  1.2       +0 -21     ports/lang/ruby19/files/patch-ext_readline_readline.c (dead)
  1.2       +0 -12     ports/lang/ruby19/files/patch-gem_prelude.rb (dead)
  1.3       +0 -20     ports/lang/ruby19/files/patch-io.c (dead)
  1.4       +0 -21     ports/lang/ruby19/files/patch-mkconfig.rb (dead)
  1.2       +0 -207    ports/lang/ruby19/files/patch-ssl1.0-compat (dead)
  1.1       +11 -0     ports/lang/ruby19/files/patch-thread_pthread.c (new)
  1.6       +196 -74   ports/lang/ruby19/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 dfilter freebsd_committer 2010-10-11 07:36:46 UTC
stas        2010-10-11 06:36:41 UTC

  FreeBSD ports repository

  Modified files:
    Mk                   bsd.ruby.mk 
    lang/ruby18/files    patch-configure.in 
  Log:
  - Do not link ruby18 agains librt.
  - Bump portrevision.
  
  PR:             ports/149003
  Submitted by:   Anonymous <swell.k@gmail.com>
  
  Revision  Changes    Path
  1.202     +2 -2      ports/Mk/bsd.ruby.mk
  1.2       +21 -5     ports/lang/ruby18/files/patch-configure.in
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 5 Stanislav Sedov freebsd_committer 2010-10-11 07:43:14 UTC
State Changed
From-To: open->closed

Committed. Thanks!