From patchwork Sun Feb 23 16:32:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20396 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A24EF27BBEA; Sun, 23 Feb 2020 16:33:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4D97427BBE4 for ; Sun, 23 Feb 2020 16:33:11 +0000 (GMT) Received: from localhost ([::1]:54462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5uBq-0004fG-PX for patchwork@mira.cbaines.net; Sun, 23 Feb 2020 11:33:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60267) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5uBj-0004el-Ch for guix-patches@gnu.org; Sun, 23 Feb 2020 11:33:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5uBi-0008Vp-BM for guix-patches@gnu.org; Sun, 23 Feb 2020 11:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5uBi-0008Vj-8W for guix-patches@gnu.org; Sun, 23 Feb 2020 11:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5uBi-0008T8-4Z for guix-patches@gnu.org; Sun, 23 Feb 2020 11:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39754] [PATCH v2] gnu: z3: Build the Python bindings References: <20200223151410.30739-1-kuba@kadziolka.net> In-Reply-To: <20200223151410.30739-1-kuba@kadziolka.net> Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Feb 2020 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39754 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39754@debbugs.gnu.org Received: via spool by 39754-submit@debbugs.gnu.org id=B39754.158247553732486 (code B ref 39754); Sun, 23 Feb 2020 16:33:02 +0000 Received: (at 39754) by debbugs.gnu.org; 23 Feb 2020 16:32:17 +0000 Received: from localhost ([127.0.0.1]:51529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5uAz-0008Rt-5v for submit@debbugs.gnu.org; Sun, 23 Feb 2020 11:32:17 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:33008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5uAw-0008Rk-Sq for 39754@debbugs.gnu.org; Sun, 23 Feb 2020 11:32:15 -0500 Received: (qmail 8871 invoked by uid 1009); 23 Feb 2020 17:32:12 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25731. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.009683 secs); 23 Feb 2020 16:32:12 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 23 Feb 2020 17:32:12 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Sun, 23 Feb 2020 17:32:45 +0100 Message-Id: <20200223163245.10253-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (z3)[arguments]: Add the --python and --pypkgdir flags to configure. --- Changed the #:modules argument to only import site-packages from (guix build python-build-system) as, as Ludo' pointed out on IRC, it also exports %standard-phases, which could conflict with (guix build gnu-build-system). I considered putting the Python bindings in a separate output; I decided not to do so as this change increases `guix size z3' from 116.4 MiB to 117.5 MiB, which is barely noticeable. gnu/packages/maths.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 535ba02ea6..cab84a520b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -4181,7 +4182,12 @@ as equations, scalars, vectors, and matrices.") "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build python-build-system) #:select (site-packages)) + (guix build gnu-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-compatability ;; Versions after 4.8.3 have immintrin.h IFDEFed for Windows only. @@ -4198,7 +4204,9 @@ as equations, scalars, vectors, and matrices.") (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "./configure" - (string-append "--prefix=" (assoc-ref outputs "out"))))) + "--python" + (string-append "--prefix=" (assoc-ref outputs "out")) + (string-append "--pypkgdir=" (site-packages inputs outputs))))) (add-after 'configure 'change-directory (lambda _ (chdir "build")