]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
fix broken Python 2.7.10 and numpy builds since recent openssl update
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 26 Jan 2021 10:03:43 +0000 (11:03 +0100)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 26 Jan 2021 10:03:43 +0000 (11:03 +0100)
products/Python.pyconf
products/patches/Python-2.7.10-ssl.patch [new file with mode: 0644]

index 8e18b56129d57731996e5eb624818a076fed2f96..4bcb1bf8db438d4f70abdcd7dccdb78f86b4ad52 100755 (executable)
@@ -36,10 +36,7 @@ version_2_6_6 :
 
 version_2_7_10 :
 {
-    patches : [
-        #'remove-windows-python-subprojects.patch', #patch Windows non applicable sur Linux
-        #'enable-windows-plugin-compilation.patch',
-    ]
+    patches : ['Python-2.7.10-ssl.patch']
 }
 
 version_3_6_5 :
diff --git a/products/patches/Python-2.7.10-ssl.patch b/products/patches/Python-2.7.10-ssl.patch
new file mode 100644 (file)
index 0000000..f660005
--- /dev/null
@@ -0,0 +1,12 @@
+--- Python/setup.py    2015-05-23 18:09:25.000000000 +0200
++++ Python_new/setup.py        2021-01-26 10:54:30.894406545 +0100
+@@ -804,7 +804,8 @@ class PyBuildExt(build_ext):
+                                      ['/usr/local/ssl/lib',
+                                       '/usr/contrib/ssl/lib/'
+                                      ] )
+-
++        ssl_incs = None
++        ssl_libs = None
+         if (ssl_incs is not None and
+             ssl_libs is not None):
+             exts.append( Extension('_ssl', ['_ssl.c'],