From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dydcJ-0002IX-4d for guix-patches@gnu.org; Sun, 01 Oct 2017 08:45:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dydcE-0004R5-4c for guix-patches@gnu.org; Sun, 01 Oct 2017 08:45:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33136) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dydcE-0004Qo-1Q for guix-patches@gnu.org; Sun, 01 Oct 2017 08:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dydcD-0006iR-Nr for guix-patches@gnu.org; Sun, 01 Oct 2017 08:45:01 -0400 Subject: [bug#28660] [PATCH] gnu: python-numpy: Give sh store location instead of setting $SHELL. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dydba-0002GE-5o for guix-patches@gnu.org; Sun, 01 Oct 2017 08:44:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dydbV-0003fs-4Q for guix-patches@gnu.org; Sun, 01 Oct 2017 08:44:22 -0400 Received: from s02-out3.spamexperts.axc.nl ([185.175.203.26]:48713) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dydbU-0003Xy-So for guix-patches@gnu.org; Sun, 01 Oct 2017 08:44:17 -0400 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1dydbL-00011G-Fd for guix-patches@gnu.org; Sun, 01 Oct 2017 14:44:08 +0200 Received: from mail.axc.nl ([185.182.56.42]:59272) by vserver42.axc.nl with esmtp (Exim 4.89) (envelope-from ) id 1dydbK-0006fZ-T7 for guix-patches@gnu.org; Sun, 01 Oct 2017 14:44:07 +0200 Date: Sun, 01 Oct 2017 14:44:04 +0200 (CEST) Message-Id: <20171001.144404.698351802734865623.post@thomasdanckaert.be> From: Thomas Danckaert Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Sun_Oct__1_14_44_04_2017_224)--" Content-Transfer-Encoding: 7bit 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: 28660@debbugs.gnu.org ----Next_Part(Sun_Oct__1_14_44_04_2017_224)-- Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 SGkgR3VpeCwNCg0KSSBzbGlnaHRseSBib3RjaGVkIHRoZSBsYXN0IG51bXB5IHVwZGF0ZTogc2V0 dGluZyAkU0hFTEwgd29ya3MsIGJ1dCANCnRoZW4gd2UgaGF2ZSB0byBzZXQgJFNIRUxMIGZvciBl dmVyeSBwYWNrYWdlIHdoaWNoIHVzZXMgbnVtcHkncyANCmRpc3R1dGlscy4gIEkgZG9uJ3Qga25v dyBob3cgbWFueSBwYWNrYWdlcyB0aGVyZSBhcmUsIGJ1dCBpdCBpbmNsdWRlcyANCnNjaXB5IGFu ZCBweXRob24taGRmIChhbmQgdGhlcmVmb3JlIHRob3NlIGJ1aWxkcyBhcmUgY3VycmVudGx5IGJy b2tlbiANCm9uIG1hc3Rlci4uLikuDQoNClRoZSBhdHRhY2hlZCBwYXRjaCBzaG91bGQgZml4IHRo ZSBpc3N1ZSBmb3IgYWxsIHBhY2thZ2VzLCBieSBzZXR0aW5nIA0KdGhlIGRlZmF1bHQgc2hlbGwg dG8gdGhlIOKAnC9iaW4vc2jigJ0gb2YgdGhlIGJ1aWxkIGVudmlyb25tZW50J3MgYmFzaCANCnBh Y2thZ2UgKGkuZS4gYmFzaC1taW5pbWFsKS4NCg0KVGhvbWFzDQo= ----Next_Part(Sun_Oct__1_14_44_04_2017_224)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-python-numpy-Give-sh-store-location-instead-of-s.patch" >From cfaebf1b09c71585b5513629005e7cf3c5d17508 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Sun, 1 Oct 2017 14:32:04 +0200 Subject: [PATCH] gnu: python-numpy: Give sh store location instead of setting $SHELL. * gnu/packages/python.scm (python-numpy): [arguments] Don't set $SHELL in the environment, but embed the location of bash as a default shell. Otherwise, we have to set $SHELL for every package which uses numpy's distutils. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e95c22de1..267715b0f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3742,8 +3742,6 @@ between language specification and implementation aspects.") (modify-phases %standard-phases (add-before 'build 'set-environment-variables (lambda* (#:key inputs #:allow-other-keys) - ;; numpy's distutils uses $SHELL to run external commands. - (setenv "SHELL" "bash") (call-with-output-file "site.cfg" (lambda (port) (format port @@ -3762,6 +3760,10 @@ include_dirs = ~a/include (assoc-ref inputs "openblas") (assoc-ref inputs "lapack") (assoc-ref inputs "lapack")))) + ;; Insert bash store location for default shell /bin/sh. + (substitute* "numpy/distutils/exec_command.py" + (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) + (string-append match-start (assoc-ref inputs "bash") match-end))) ;; Use "gcc" executable, not "cc". (substitute* "numpy/distutils/system_info.py" (("c = distutils\\.ccompiler\\.new_compiler\\(\\)") -- 2.14.1 ----Next_Part(Sun_Oct__1_14_44_04_2017_224)----