Merge pull request #13033 from commodo/pynacl-fix

python-pynacl: fix build with new libsodium patch

lang/python/python-pynacl/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-pynacl
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PYPI_NAME:=PyNaCl
 PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505

lang/python/python-pynacl/patches/001-always-compile-scalar-mult-ed25519.patch

@@ -0,0 +1,13 @@
+diff --git a/src/bindings/minimal/crypto_scalarmult.h b/src/bindings/minimal/crypto_scalarmult.h
+index 06ca1ef..9bc3d8e 100644
+--- a/src/bindings/minimal/crypto_scalarmult.h
++++ b/src/bindings/minimal/crypto_scalarmult.h
+@@ -13,7 +13,7 @@
+  * limitations under the License.
+  */
+ 
+-#ifdef SODIUM_LIBRARY_MINIMAL
++#if 0
+ static const int PYNACL_HAS_CRYPTO_SCALARMULT_ED25519 = 0;
+ 
+ size_t (*crypto_scalarmult_ed25519_bytes)() = NULL;