[pypy-commit] pypy openssl-for-macos: add no-shared to _ssl, separate "make" from "make install"

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: openssl-for-macos
Changeset: r97423:cf76a77c4734
Date: 2019-09-10 22:57 +0300
http://bitbucket.org/pypy/pypy/changeset/cf76a77c4734/

Log:	add no-shared to _ssl, separate "make" from "make install"

diff --git a/pypy/tool/build_cffi_imports.py b/pypy/tool/build_cffi_imports.py
--- a/pypy/tool/build_cffi_imports.py
+++ b/pypy/tool/build_cffi_imports.py
@@ -24,7 +24,7 @@
 cffi_dependencies = {
     '_ssl': ('https://www.openssl.org/source/openssl-1.1.1c.tar.gz',
             'f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90',
-            []),
+            ['no-shared']),
     '_gdbm': ('http://ftp.gnu.org/gnu/gdbm/gdbm-1.13.tar.gz',
               '9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253',
               ['--without-readline']),
@@ -109,9 +109,6 @@
         './config',
         [
             '--prefix=/usr',
-            '--disable-shared',
-            '--enable-silent-rules',
-            '--disable-dependency-tracking',
         ] + args,
         cwd=sources,
     )
@@ -125,11 +122,20 @@
         'make',
         [
             '-s', '-j' + str(multiprocessing.cpu_count()),
+        ],
+        cwd=sources,
+    )
+    if status != 0:
+        return status, stdout, stderr
+
+    print('installing to', destdir, file=sys.stderr)
+    status, stdout, stderr = run_subprocess(
+        'make',
+        [
             'install', 'DESTDIR={}/'.format(destdir),
         ],
         cwd=sources,
     )
-
     return status, stdout, stderr