aboutsummaryrefslogtreecommitdiffstats
path: root/lang/ruby21
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2014-03-23 23:31:43 +0800
committerswills <swills@FreeBSD.org>2014-03-23 23:31:43 +0800
commitfb1f98bc4f2cd18e667d1c0979ca246ff58d0a6d (patch)
tree50119b9245c88d48c5dafefa65109275d3bfbd6b /lang/ruby21
parentdccd349d9335a9e5cd5421d45138e30213ed0c55 (diff)
downloadfreebsd-ports-gnome-fb1f98bc4f2cd18e667d1c0979ca246ff58d0a6d.tar.gz
freebsd-ports-gnome-fb1f98bc4f2cd18e667d1c0979ca246ff58d0a6d.tar.zst
freebsd-ports-gnome-fb1f98bc4f2cd18e667d1c0979ca246ff58d0a6d.zip
- Fix patch broken in r292221
PR: ports/187472 Redported by: Jeremy Chadwick <jdc@koitsu.org>
Diffstat (limited to 'lang/ruby21')
-rw-r--r--lang/ruby21/files/patch-configure.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/lang/ruby21/files/patch-configure.in b/lang/ruby21/files/patch-configure.in
index 0f309e87cb68..3153a0629187 100644
--- a/lang/ruby21/files/patch-configure.in
+++ b/lang/ruby21/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig 2014-02-21 23:32:34.000000000 +0000
-+++ configure.in 2014-02-24 14:54:59.432610152 +0000
+--- configure.in.orig 2014-03-20 05:40:57.873422152 +0000
++++ configure.in 2014-03-20 05:40:57.873422152 +0000
@@ -1084,10 +1084,10 @@
],
[ LIBS="-lm $LIBS"])
@@ -33,14 +33,14 @@
AC_CHECK_LIB($pthread_lib, pthread_kill,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then break; fi
-@@ -2431,6 +2431,7 @@
- if test x"$rb_with_pthread" = xyes; then
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
+@@ -2437,6 +2437,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],
+ [AS_CASE(["$target_os"],
+ [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
+ [LIBS="-l$pthread_lib $LIBS"])])
@@ -2668,7 +2669,6 @@
: ${LDSHARED='$(CC) -shared'}
if test "$rb_cv_binary_elf" = yes; then