From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv5hD-0003RS-VA for guix-patches@gnu.org; Wed, 29 Aug 2018 15:00:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv5hC-0000nA-MH for guix-patches@gnu.org; Wed, 29 Aug 2018 15:00:03 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60647) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fv5hC-0000mk-EI for guix-patches@gnu.org; Wed, 29 Aug 2018 15:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fv5hC-0006b1-6n for guix-patches@gnu.org; Wed, 29 Aug 2018 15:00:02 -0400 Subject: [bug#32579] [PATCH] gnu: Add guile-mingw 2.2.3. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv5g9-0001c0-SL for guix-patches@gnu.org; Wed, 29 Aug 2018 14:58:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv5g8-00005O-Hs for guix-patches@gnu.org; Wed, 29 Aug 2018 14:58:57 -0400 From: Jan Nieuwenhuizen Date: Wed, 29 Aug 2018 20:58:43 +0200 Message-ID: <87sh2xrod8.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32579@debbugs.gnu.org --=-=-= Content-Type: text/plain Hi! I created a mingw32 cross build for guile-2.0 some time ago, expecting to need it real soon for "work" or for LilyPond. Neither need materialized until now; but it very soon. Luckily, I found that Mike Gran did quite some work this spring on their wip-mingw-guile-2.2 branch; so I packaged the latest snapshot. Not sure if we want this in Guix -- but here it is. I did a simple test under wine and it seems to work. janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-guile-mingw-2.2.3.patch Content-Transfer-Encoding: quoted-printable >From 8dd3f24ddc6e14879210c584e6cd746f80f1e052 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 29 Aug 2018 20:50:13 +0200 Subject: [PATCH] gnu: Add guile-mingw 2.2.3. * gnu/packages/guile.scm (guile-mingw): New variable. --- gnu/packages/guile.scm | 50 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a585dd6dc..34c60b9fd 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -9,7 +9,7 @@ ;;; Copyright =C2=A9 2016, 2017 Alex Kost ;;; Copyright =C2=A9 2016, 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright =C2=A9 2016 Amirouche -;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen +;;; Copyright =C2=A9 2016,2018 Jan Nieuwenhuizen ;;; Copyright =C2=A9 2017 Andy Wingo ;;; Copyright =C2=A9 2017 David Thompson ;;; Copyright =C2=A9 2017 Mathieu Othacehe @@ -316,6 +316,54 @@ without requiring the source code to be rewritten.") (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))= )) =20 +(define-public guile-mingw + (package + (inherit guile-2.2) + (version "2.2.3") + (name "guile-mingw") + (source (origin + (inherit (package-source guile-2.2)) + (uri (string-append "http://git.savannah.gnu.org/cgit/guile.= git/snapshot/guile-6d6bc013e1f9db98334e1212295b8be0e39fbf0a.tar.gz")) + (sha256 + (base32 + "0c1j05gz5kxnxp50h1da6idxq6fiaylx9pqq7mwdiwrb569apvzp")))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("flex" ,flex) + ("texinfo" ,texinfo) + ,@(package-native-inputs guile-2.2))) + (arguments + `(#:tests? #f + ,@(substitute-keyword-arguments (package-arguments guile-2.2) + ((#:tests? _) #f) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + ,@(append + (if (target-mingw?) + '((delete 'sacrifice-elisp-support) + (add-after 'bootstrap 'sacrifice-elisp-support + (lambda _ + ;; Cross-compiling language/elisp/boot.el fail= s, so + ;; sacrifice it. See + ;; + ;; for the upstream fix. + (substitute* "module/Makefile.in" + (("language/elisp/boot\\.el") + "\n")) + #t))) + '()) + '((replace 'bootstrap + (lambda _ + (invoke "sh" "autogen.sh"))) + (add-before 'bootstrap 'patch-/bin/sh + (lambda _ + (substitute* "build-aux/git-version-gen" + (("#!/bin/sh") (string-append "#!" (which "sh"))= )) + #t))))))))))) ; ./bootstrap is a directory + + (define-public guile-next (deprecated-package "guile-next" guile-2.2)) =20 --=20 2.18.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com --=-=-=--