[pypy-commit] pypy py3.6: Add _blake2 to the build_cffi_imports script.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3.6
Changeset: r93887:6f93003631b8
Date: 2018-02-25 19:52 +0100
http://bitbucket.org/pypy/pypy/changeset/6f93003631b8/

Log:	Add _blake2 to the build_cffi_imports script.

diff --git a/lib_pypy/_blake2/_blake2_build.py b/lib_pypy/_blake2/_blake2_build.py
--- a/lib_pypy/_blake2/_blake2_build.py
+++ b/lib_pypy/_blake2/_blake2_build.py
@@ -41,8 +41,8 @@
 """
 
 blake2b_source = """
-#include "blake2.h"
-#include "blake2-impl.h"
+#include "impl/blake2.h"
+#include "impl/blake2-impl.h"
 
 #define BLAKE_OUTBYTES BLAKE2B_OUTBYTES
 #define BLAKE_SALTBYTES BLAKE2B_SALTBYTES
@@ -63,7 +63,7 @@
 """
 
 
-_libdir = os.path.join(os.path.dirname(__file__), 'impl')
+_libdir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'impl'))
 
 blake2b_ffi = FFI()
 blake2b_ffi.cdef(blake_cdef)
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
@@ -18,7 +18,8 @@
     "lzma": "_lzma_build.py",
     "_decimal": "_decimal_build.py",
     "_ssl": "_ssl_build.py",
-    # hashlib does not need to be built! It uses API calls from _ssl
+    "_blake2": "_blake2/_blake2_build.py",
+    "_sha3": "_sha3/_sha3_build.py",
     "xx": None,    # for testing: 'None' should be completely ignored
     }