From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Sun, 23 Feb 2020 17:32:45 +0100 Message-Id: <20200223163245.10253-1-kuba@kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 39754@debbugs.gnu.org * 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") -- 2.25.0