Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit 2d26c37b authored by MARAIT Gilles's avatar MARAIT Gilles
Browse files

Fix some scalable-python compile/install issues

parent 3fe8867c
......@@ -891,16 +891,31 @@ CTAGS = $(CTAGSPROG)
(url home-page)
(commit "b0b9d3f29298b719f9e4f684deae713c0a224b0e")
(patches (search-patches "inria/patches/scalable-python.patch"))
(substitute-keyword-arguments (package-arguments python-2.7)
((#:phases phases)
`(modify-phases ,phases
(add-before 'configure 'permissions_gramfiles
(lambda _
(chmod "Python/graminit.c" #o764)
(chmod "Include/graminit.h" #o764) #t))
(add-before 'build 'fix_makefile
(lambda _
(chmod "Python/graminit.c" #o764)
(chmod "Include/graminit.h" #o764) #t))
(replace 'move-tk-inter (lambda _ #t)) ;; Not sure what this is anyway
((#:configure-flags flags '())
`(cons "--enable-mpi" ,flags))
`(cons "--enable-mpi" (cons "--without-ensurepip" (delete "--with-ensurepip=install",flags)))
((#:make-flags makeflags '())
`(cons "install-mpi" (cons "mpi" ,makeflags)))
`(cons "mpi" (cons "install-mpi",makeflags)))
((#:tests? runtests '())
"Modified python 2.7.13. Scalable Python performs the I/O operations used
e.g. by import statements in a single process and uses MPI to transmit data
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index 40c10fa..8ae763e 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -122,7 +122,7 @@ _weakref _weakref.c # weak references
# The zipimport module is always imported at startup. Having it as a
# builtin module avoids some bootstrapping problems and reduces overhead.
-zipimport zipimport.c
+# zipimport zipimport.c
# The rest of the modules listed in this file are all commented out by
# default. Usually they can be detected and built as dynamically
@@ -170,7 +170,7 @@ GLHACK=-Dclear=__GLclear
array arraymodule.c # array objects
cmath cmathmodule.c _math.c # -lm # complex math library functions
-math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
+math mathmodule.c #_math.c # -lm # math library functions, e.g. sin()
_struct _struct.c # binary structure packing/unpacking
time timemodule.c # -lm # time operations and variables
operator operator.c # operator.add() and similar goodies
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment