Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Nov 2019 13:06:34 +0000 (UTC)
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r516970 - in head/devel/ruby-build: . files
Message-ID:  <201911071306.xA7D6ZoK080276@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: meta
Date: Thu Nov  7 13:06:34 2019
New Revision: 516970
URL: https://svnweb.freebsd.org/changeset/ports/516970

Log:
  devel/ruby-build: Update to 20191030
  
  and use GNU make when building Ruby to avoid Ruby build failure.
  
  PR:		241633
  Submitted by:	Yuichiro NAITO <naito.yuichiro@gmail.com>, myself
  Sponsored by:	HAW International, Inc.

Added:
  head/devel/ruby-build/files/
  head/devel/ruby-build/files/patch-bin_ruby-build   (contents, props changed)
Modified:
  head/devel/ruby-build/Makefile
  head/devel/ruby-build/distinfo

Modified: head/devel/ruby-build/Makefile
==============================================================================
--- head/devel/ruby-build/Makefile	Thu Nov  7 12:53:03 2019	(r516969)
+++ head/devel/ruby-build/Makefile	Thu Nov  7 13:06:34 2019	(r516970)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ruby-build
-PORTVERSION=	20191004 # pend update until bug 241633 solved
+PORTVERSION=	20191030
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel ruby
 

Modified: head/devel/ruby-build/distinfo
==============================================================================
--- head/devel/ruby-build/distinfo	Thu Nov  7 12:53:03 2019	(r516969)
+++ head/devel/ruby-build/distinfo	Thu Nov  7 13:06:34 2019	(r516970)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570594875
-SHA256 (rbenv-ruby-build-v20191004_GH0.tar.gz) = 6f053957acb0af6d621ebf2b9dacc9c265844b2dc6842a021eb10f0a70094fe8
-SIZE (rbenv-ruby-build-v20191004_GH0.tar.gz) = 63345
+TIMESTAMP = 1573003323
+SHA256 (rbenv-ruby-build-v20191030_GH0.tar.gz) = 6f13124f7bc6e65930606dec25f26305f132dc3596035b09d48576f1eb0ea5c7
+SIZE (rbenv-ruby-build-v20191030_GH0.tar.gz) = 63632

Added: head/devel/ruby-build/files/patch-bin_ruby-build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ruby-build/files/patch-bin_ruby-build	Thu Nov  7 13:06:34 2019	(r516970)
@@ -0,0 +1,20 @@
+--- bin/ruby-build.orig	2019-10-30 17:11:02 UTC
++++ bin/ruby-build
+@@ -1317,15 +1317,8 @@ fi
+ 
+ if [ -z "$MAKE" ]; then
+   if [ "FreeBSD" = "$(uname -s)" ]; then
+-    if [ "$(echo $1 | sed 's/-.*$//')" = "jruby" ]; then
+-      export MAKE="gmake"
+-    else
+-      if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
+-        export MAKE="gmake"
+-      else
+-        export MAKE="make"
+-      fi
+-    fi
++    # FreeBSD bug 241633: fails to build due to race condition
++    export MAKE="gmake"
+   else
+     export MAKE="make"
+   fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911071306.xA7D6ZoK080276>