View | Details | Raw Unified | Return to bug 241633 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	ruby-build
3
PORTNAME=	ruby-build
4
PORTVERSION=	20191004 # pend update until bug 241633 solved
4
PORTVERSION=	20191030
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
CATEGORIES=	devel ruby
6
CATEGORIES=	devel ruby
7
7
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1570594875
1
TIMESTAMP = 1573003323
2
SHA256 (rbenv-ruby-build-v20191004_GH0.tar.gz) = 6f053957acb0af6d621ebf2b9dacc9c265844b2dc6842a021eb10f0a70094fe8
2
SHA256 (rbenv-ruby-build-v20191030_GH0.tar.gz) = 6f13124f7bc6e65930606dec25f26305f132dc3596035b09d48576f1eb0ea5c7
3
SIZE (rbenv-ruby-build-v20191004_GH0.tar.gz) = 63345
3
SIZE (rbenv-ruby-build-v20191030_GH0.tar.gz) = 63632
(-)files/patch-bin_ruby-build (+20 lines)
Line 0 Link Here
1
--- bin/ruby-build.orig	2019-10-30 17:11:02 UTC
2
+++ bin/ruby-build
3
@@ -1317,15 +1317,8 @@ fi
4
 
5
 if [ -z "$MAKE" ]; then
6
   if [ "FreeBSD" = "$(uname -s)" ]; then
7
-    if [ "$(echo $1 | sed 's/-.*$//')" = "jruby" ]; then
8
-      export MAKE="gmake"
9
-    else
10
-      if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
11
-        export MAKE="gmake"
12
-      else
13
-        export MAKE="make"
14
-      fi
15
-    fi
16
+    # FreeBSD bug 241633: fails to build due to race condition
17
+    export MAKE="gmake"
18
   else
19
     export MAKE="make"
20
   fi

Return to bug 241633