From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: bug#26136: core-updates: python-minimal@2.7.13 fails due to missing zlib Date: Sun, 19 Mar 2017 15:19:50 -0400 Message-ID: <20170319191950.GA14148@jasmine> References: <20170317014622.GA27842@jasmine> <20170317150851.56e225f0@scratchpost.org> <20170318172601.GA2721@jasmine> <20170318211901.35ed1744@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wzJLGUyc3ArbnUjN" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpgO3-00042D-0p for bug-guix@gnu.org; Sun, 19 Mar 2017 15:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpgNz-0003ZY-2K for bug-guix@gnu.org; Sun, 19 Mar 2017 15:21:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37256) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cpgNy-0003ZU-Nq for bug-guix@gnu.org; Sun, 19 Mar 2017 15:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cpgNy-0002mt-Id for bug-guix@gnu.org; Sun, 19 Mar 2017 15:21:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <20170318211901.35ed1744@scratchpost.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Danny Milosavljevic Cc: 26136@debbugs.gnu.org --wzJLGUyc3ArbnUjN Content-Type: multipart/mixed; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Mar 18, 2017 at 09:19:01PM +0100, Danny Milosavljevic wrote: > An alternative workaround is to use this instead: >=20 > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index be452f062..04c944d84 100644 > --- a/gnu/packages/python.scm12/bin/shore-updates/guix$ /gnu/store/k7029k= 5va68lka > +++ b/gnu/packages/python.scm > @@ -229,6 +229,8 @@ > ;; before 1980". Work around this by setting the file times = in the > ;; source tree to sometime in early 1980. > (lambda _ > + (setenv "CONFIG_SHELL" (which "bash")) > + I think this is the better solution to the libffi / ctypes issue. It also fixes python-minimal@3 to use the bundled libffi. We added libffi to python-minimal@3's inputs in d0b73960db051baa468fc1a0fbab21fa9f89f885 to work around a similar issue. In Python 3.7, the bundled libffi will be removed, and we will have to build our minimal Python-3 variant with an external libffi package: https://bugs.python.org/issue27976 Here's a patch that fixes this problem for python-minimal@2. I don't want to change python-minimal@3 this late in the core-updates cycle; we can do it in a python-updates branch after core-updates. --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-python-minimal-2-Fix-build-failure-due-to-missin.patch" Content-Transfer-Encoding: quoted-printable =46rom 9d7eef243fca8e53fb89bb17a999f0678d191caf Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sun, 19 Mar 2017 02:43:37 -0400 Subject: [PATCH] gnu: python-minimal@2: Fix build failure due to missing libffi. * gnu/packages/python.scm (python-2)[arguments]: Add 'setenv' phase. (python2-minimal)[inputs]: Add zlib. Co-authored-by: Danny Milosavljevic --- gnu/packages/python.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index be452f062..95bf53c8f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -17,7 +17,7 @@ ;;; Copyright =A9 2015, 2016 Efraim Flashner ;;; Copyright =A9 2015 Kyle Meyer ;;; Copyright =A9 2015, 2016 Chris Marusich -;;; Copyright =A9 2016 Danny Milosavljevic +;;; Copyright =A9 2016, 2017 Danny Milosavljevic ;;; Copyright =A9 2016 Lukas Gradl ;;; Copyright =A9 2016 Hartmut Goebel ;;; Copyright =A9 2016 Daniel Pimentel @@ -223,6 +223,19 @@ (setenv "HOME" (getcwd)) #t)) (add-after + 'unpack 'setenv + (lambda _ + ;; 'Modules/_ctypes/libffi/configure' contains scripts embedd= ed in + ;; HEREDOCs whose shebangs aren't patched by the patch-shebang + ;; phase. Setting this variables works around that shortcomi= ng and + ;; allows us to keep using the bundled libffi in python-minim= al and + ;; python2-minimal. + ;; XXX The bundled libffi will be removed in Python 3.7: + ;; https://bugs.python.org/issue27976 + ;; https://github.com/python/cpython/commit/935043d1ac19d07ac= 48233c6175250e66a7bbebd + ;; https://github.com/python/cpython/commit/f40d4ddff3c800b3c= 956a5e8820aabe3aa87cddd + (setenv "CONFIG_SHELL" (which "sh")))) + (add-after 'unpack 'set-source-file-times-to-1980 ;; XXX One of the tests uses a ZIP library to pack up some of t= he ;; source tree, and fails with "ZIP does not support timestamps @@ -363,7 +376,7 @@ data types.") (substitute-keyword-arguments (package-arguments python-2) ((#:configure-flags cf) `(append ,cf '("--without-system-ffi"))))) - (inputs '()))) ;none of the optional dependen= cies + (inputs `(("zlib" ,zlib))))) =20 (define-public python-minimal (package (inherit python) --=20 2.12.0 --6TrnltStXW4iwmi0-- --wzJLGUyc3ArbnUjN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljO2dIACgkQJkb6MLrK fwi48RAAtz8U4b2+/hJQOHD1Ou+SsxtSCgJyJEidWPQd9DcVxSATfTir+bOGEeGh zg2/Bw92/bkmospwCoJRrwQvBBQb+ZVgbZ5SW8vou6dNGWY+KL/PDelc1UXT7sw3 6aGD6iLJgGzNYUc1oqK1pdYsnjOQWYj5ZJwhM6eOlN0POIj8I087dra4vmMy5Gb+ y5SwvmlHqX0B2er3Z53dOJNmyxc2XazHnwKdBH3qz5OTILd/34NZ2iq0vGhUeDAR jqwxBp2icjYfrEMEDPJJc5bSmLYcbEsFS0O17HWiifLXu5p6DsuKqdhiWAhmgIra 4PeAFZ+NML9WW/mbKqeEjy/gBXhUdIa4aAdIr+4MpUUxVROsGWKQtDzD3Bar7fNx 7eNzwQrTri6IvelX/Zd5COtaaKQYeh7ZfsgV0Xkw+6adqe8E+4/GuQePLMaMHHl0 Xzmz/etyK+b/rYg5YvdDWnhAiG+DbR7H93Elmwl1DxyUxdWHEAW6IfmAzyUCli7F 9fq8ghQ2kIgcTLOVqOnEIhqDk0uYFxqg/h/UFqZD2H+u5bgqWpo3a0QegOw8ybBN rclmO4rzTZn73zvJ58Zs6rhgKRtDQlNmgzYdgK52KVZG97EVZw/0nDu3uXH1HsJE gMUpBs0UkvoWvy7deXWjyy1lLSJZo8UYdqhYcuxfrTavgWx1hjI= =9Y3w -----END PGP SIGNATURE----- --wzJLGUyc3ArbnUjN--