From 73082e77ce84b9b8273ef779f72aa0518a03b9f4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Aug 19 2017 22:30:06 +0000 Subject: Added -crowbar patch to make timeouts while building less likely. --- diff --git a/polyml-crowbar.patch b/polyml-crowbar.patch new file mode 100644 index 0000000..29b1b76 --- /dev/null +++ b/polyml-crowbar.patch @@ -0,0 +1,11 @@ +--- libpolyml/processes.cpp.orig 2017-03-22 11:51:06.000000000 -0600 ++++ libpolyml/processes.cpp 2017-08-19 16:15:49.545151184 -0600 +@@ -1885,7 +1885,7 @@ void Processes::CrowBarFn(void) + #if (defined(HAVE_PTHREAD) || defined(HAVE_WINDOWS_H)) + shutdownLock.Lock(); + crowbarRunning = true; +- if (crowbarLock.WaitFor(&shutdownLock, 20000)) // Wait for 20s ++ if (crowbarLock.WaitFor(&shutdownLock, 200000)) // Wait for 200s + { + // We've been woken by the main thread. Let it do the shutdown. + crowbarStopped.Signal(); diff --git a/polyml.spec b/polyml.spec index e302c23..2ba95a0 100644 --- a/polyml.spec +++ b/polyml.spec @@ -10,6 +10,9 @@ License: LGPLv2+ URL: http://www.polyml.org/ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz +# Increase the main thread timeout, which is often reached on koji builders +Patch0: %{name}-crowbar.patch + # The standard solution to kill the libtool-induced RPATH is to edit the # libtool script to kill it. However, that causes problems for us as we need # to run polyimport at build time. With the standard approach, it cannot find @@ -53,6 +56,7 @@ Runtime libraries for Poly/ML. %prep %setup -q +%patch0 %build # Some hand-coded assembler is included. Because it does not contain an @@ -106,6 +110,9 @@ make check %{_libdir}/libpolyml.so.* %changelog +* Sat Aug 19 2017 Jerry James - 5.7-3 +- Added -crowbar patch to make timeouts while building less likely + * Thu Aug 03 2017 Fedora Release Engineering - 5.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild