diff options
| author | Steve Wills <swills@FreeBSD.org> | 2014-03-23 15:31:43 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2014-03-23 15:31:43 +0000 |
| commit | eedf7913ee3953191b93b75b7c003fc184a8f238 (patch) | |
| tree | 50119b9245c88d48c5dafefa65109275d3bfbd6b /lang/ruby19/files/patch-configure.in | |
| parent | - Only create ports-mgmt/pkg latest link if can write to PACKAGES (diff) | |
- Fix patch broken in r292221
PR: ports/187472
Redported by: Jeremy Chadwick <jdc@koitsu.org>
Notes
Notes:
svn path=/head/; revision=348863
Diffstat (limited to 'lang/ruby19/files/patch-configure.in')
| -rw-r--r-- | lang/ruby19/files/patch-configure.in | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lang/ruby19/files/patch-configure.in b/lang/ruby19/files/patch-configure.in index 3ba840dc4a62..f7acf1f7412e 100644 --- a/lang/ruby19/files/patch-configure.in +++ b/lang/ruby19/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-02-11 14:33:14.000000000 +0000 -+++ configure.in 2013-02-11 14:30:13.000000000 +0000 -@@ -1129,11 +1129,11 @@ +--- configure.in.orig 2014-03-20 05:49:55.847385089 +0000 ++++ configure.in 2014-03-20 05:50:09.238383528 +0000 +@@ -1139,11 +1139,11 @@ [superux*], [ ac_cv_func_setitimer=no ], [ LIBS="-lm $LIBS"]) @@ -17,7 +17,7 @@ if test "${enable_win95}" = maybe; then AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no]) fi -@@ -1828,7 +1828,7 @@ +@@ -1789,7 +1789,7 @@ fi if test x"$enable_pthread" = xyes; then @@ -26,15 +26,15 @@ AC_CHECK_LIB($pthread_lib, pthread_kill, rb_with_pthread=yes, rb_with_pthread=no) if test "$rb_with_pthread" = "yes"; then break; fi -@@ -1836,6 +1836,7 @@ - if test x"$rb_with_pthread" = xyes; then - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) +@@ -1803,6 +1803,7 @@ + [c], [], + [root], [], + [c_r], [MAINLIBS="-pthread $MAINLIBS"], + [pthread], [MAINLIBS="-pthread $MAINLIBS"], - AC_DEFINE(HAVE_LIBPTHREAD) - AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>]) - AS_CASE([$pthread_lib], -@@ -2080,7 +2081,6 @@ + [AS_CASE(["$target_os"], + [openbsd*], [LIBS="-pthread $LIBS"], + [LIBS="-l$pthread_lib $LIBS"])]) +@@ -2041,7 +2042,6 @@ : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" @@ -42,7 +42,7 @@ else test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi -@@ -2385,6 +2385,7 @@ +@@ -2348,6 +2348,7 @@ [freebsd*|dragonfly*], [ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' |