From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: Re: Building Guix with Guile 2.1 Date: Wed, 28 Sep 2016 16:56:10 +0200 Message-ID: <87lgycgjjp.fsf@gmail.com> References: <87fuotl367.fsf@gnu.org> <87vaxpnf11.fsf@T420.taylan> <874m518yhs.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpGDL-0003wX-RG for guix-devel@gnu.org; Wed, 28 Sep 2016 10:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpGDK-0004QY-P7 for guix-devel@gnu.org; Wed, 28 Sep 2016 10:52:03 -0400 In-Reply-To: <874m518yhs.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 27 Sep 2016 11:48:15 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > taylanbayirli@gmail.com (Taylan Ulrich "Bay=C4=B1rl=C4=B1/Kammer") skribi= s: > >> I think we can keep the (compile 'dummy) hack. That leaves two issues >> which may be solved in a cleaner manner than in this patch: >> >> - The (define foo (@@ (bar) foo)) parts. >> - Making %tty-gid public. (The above didn't work for this one...) > > Fixed in 3c185b24f593c982aeb33996324fa6878c6ed21b, thanks for reporting > it! Thanks for the fixes. :-) I haven't made much progress regarding the -O1 setting to speed up building, but for the time being here's the patch that would make the build process work at all on 2.2, including for 'guix pull'. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-build-Improve-Guile-2.2-compatibility.patch >From 91d8e2f426f442de094166d724e91cc24e6cbd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Tue, 27 Sep 2016 22:34:06 +0200 Subject: [PATCH] build: Improve Guile 2.2 compatibility. * build-aux/compile-all.scm (compile-file*): Ensure loading of compilation related modules before going parallel. * guix/build/pull.scm (build-guix): Ditto. --- build-aux/compile-all.scm | 3 +++ guix/build/pull.scm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm index 7c937a0..46b3817 100644 --- a/build-aux/compile-all.scm +++ b/build-aux/compile-all.scm @@ -81,6 +81,9 @@ (let ((files (filter file-needs-compilation? files))) (for-each load-module-file files) (let ((mutex (make-mutex))) + ;; Make sure compilation related modules are loaded before starting to + ;; compile files in parallel. + (compile #f) (par-for-each (lambda (file) (compile-file* file mutex)) files))))) diff --git a/guix/build/pull.scm b/guix/build/pull.scm index ccf1868..871bf6f 100644 --- a/guix/build/pull.scm +++ b/guix/build/pull.scm @@ -125,6 +125,9 @@ containing the source code. Write any debugging output to DEBUG-PORT." (newline) (let ((mutex (make-mutex)) (completed 0)) + ;; Make sure compilation related modules are loaded before starting to + ;; compile files in parallel. + (compile #f) (par-for-each (lambda (file) (with-mutex mutex -- 2.10.0 --=-=-=--