[gentoo-commits] repo/gentoo:master commit in: dev-lang/crystal/files/, dev-lang/crystal/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     c0192cdd4f44c25ba6d7c3261a48b522ba4a5ca5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 10:04:41 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 10:13:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0192cdd

Revert "dev-lang/crystal: [QA] Move patches to a distfile"

This reverts commit e4e28b774ec066428e0116b94af8baad3e95c559.

There is no policy about patches in distfiles:
https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies

 dev-lang/crystal/crystal-0.23.1.ebuild               |  4 ++--
 .../files/crystal-0.22.0-blocking-stdio-hack.patch   | 20 ++++++++++++++++++++
 .../files/crystal-0.23.0-verbose-LDFLAGS.patch       |  9 +++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dev-lang/crystal/crystal-0.23.1.ebuild b/dev-lang/crystal/crystal-0.23.1.ebuild
index 41f26d88e36..c1b0b885924 100644
--- a/dev-lang/crystal/crystal-0.23.1.ebuild
+++ b/dev-lang/crystal/crystal-0.23.1.ebuild
@@ -38,14 +38,14 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${WORKDIR}"/${P}-patchset/${PN}-0.23.0-verbose-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-0.23.0-verbose-LDFLAGS.patch
 	"${WORKDIR}"/${P}-patchset/${PN}-0.23.1-llvm-5.patch
 )
 
 src_prepare() {
 	default
 
-	use blocking-stdio-hack && eapply "${WORKDIR}"/${P}-patchset/${PN}-0.22.0-blocking-stdio-hack.patch
+	use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch
 }
 
 src_compile() {

diff --git a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
new file mode 100644
index 00000000000..07b7dba7be6
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch
@@ -0,0 +1,20 @@
+Workaround tty corruption in crystal.
+
+Patch restores blocking mode of file desriptors
+in exchange of potential runtime deadlocks
+when dealing with stdio.
+
+Reported-by: Renich Bon Ciric
+Bug: https://github.com/crystal-lang/crystal/issues/2065
+Bug: https://bugs.gentoo.org/616256
+diff --git a/src/compiler/crystal/stdio.cr b/src/compiler/crystal/stdio.cr
+new file mode 100644
+index 000000000..e65f65089
+--- /dev/null
++++ b/src/compiler/crystal/stdio.cr
+@@ -0,0 +1,5 @@
++module Crystal
++  STDIN.blocking = true
++  STDOUT.blocking=true
++  STDERR.blocking = true
++end

diff --git a/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch b/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch
new file mode 100644
index 00000000000..35eace15dae
--- /dev/null
+++ b/dev-lang/crystal/files/crystal-0.23.0-verbose-LDFLAGS.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index eff69e5..5c0c024 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,3 +28,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )
++FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(verbose),--verbose )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
+ SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )