Skip to content

Commit

Permalink
Update package: pynacl
Browse files Browse the repository at this point in the history
  • Loading branch information
mhsmith committed Jan 16, 2022
1 parent d7d0c04 commit 7608c83
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
7 changes: 4 additions & 3 deletions server/pypi/packages/pynacl/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package:
name: PyNaCl
version: 1.3.0
version: 1.5.0

build:
number: 1
requirements:
build:
- cffi 1.13.2
29 changes: 16 additions & 13 deletions server/pypi/packages/pynacl/patches/chaquopy.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
--- src-original/setup.py 2018-09-26 18:57:49.000000000 +0000
+++ src/setup.py 2019-01-31 15:02:10.361223549 +0000
@@ -167,16 +167,21 @@
configure, "--disable-shared", "--enable-static",
"--disable-debug", "--disable-dependency-tracking",
"--with-pic", "--prefix", os.path.abspath(self.build_clib),
--- src-original/setup.py 2022-01-07 21:54:10.000000000 +0000
+++ src/setup.py 2022-01-16 18:42:51.775026999 +0000
@@ -150,6 +150,9 @@
"--disable-debug",
"--disable-dependency-tracking",
"--with-pic",
+
+ # Chaquopy
+ "--host", os.path.basename(os.environ["CC"]).replace("-gcc", ""),
],
+ # Chaquopy
+ "--host", os.environ["CHAQUOPY_TRIPLET"],
]
if platform.system() == "SunOS":
# On Solaris, libssp doesn't link statically and causes linker
@@ -164,12 +167,15 @@
cwd=build_temp,
)

make_args = os.environ.get('LIBSODIUM_MAKE_ARGS', '').split()
+ # Chaquopy
+ make_args += ["-j", str(os.cpu_count())]
+ os.environ["LIBSODIUM_MAKE_ARGS"] = f"-j {os.cpu_count()}"
+
make_args = os.environ.get("LIBSODIUM_MAKE_ARGS", "").split()
# Build the library
subprocess.check_call(["make"] + make_args, cwd=build_temp)

- # Check the build library
# Check the build library
- subprocess.check_call(["make", "check"] + make_args, cwd=build_temp)
+ # Chaquopy: removed `make check`
+ # Chaquopy disabled: subprocess.check_call(["make", "check"] + make_args, cwd=build_temp)

# Install the built library
subprocess.check_call(["make", "install"] + make_args, cwd=build_temp)

0 comments on commit 7608c83

Please sign in to comment.