← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~yuliys/launchpad:arm64 into launchpad:master

 

Yuliy Schwartzburg has proposed merging ~yuliys/launchpad:arm64 into launchpad:master.

Commit message:
Add arm64 support to PIP_ENV flags

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~yuliys/launchpad/+git/launchpad/+merge/470244
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~yuliys/launchpad:arm64 into launchpad:master.
diff --git a/Makefile b/Makefile
index a310604..d9bbbb6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,11 @@ PIP_NO_INDEX := 1
 PIP_ENV += PIP_NO_INDEX=$(PIP_NO_INDEX)
 PIP_ENV += PIP_FIND_LINKS="file://$(WD)/wheels/ file://$(WD)/download-cache/dist/"
 
+PLATFORM:=$(shell uname -p)
+ifeq ($(PLATFORM),aarch64)
+PIP_ENV += SODIUM_INSTALL=system
+endif
+
 VIRTUALENV := $(PIP_ENV) /usr/bin/virtualenv
 PIP := PYTHONPATH= $(PIP_ENV) env/bin/pip --cache-dir=$(WD)/download-cache/
 

Follow ups