From 1e3a136ce18c02d04903befd94c26c4632ed7f07 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Wed, 6 Feb 2019 17:12:01 -0800
Subject: [PATCH] Install FASM into environment properly.

This will make sure that any requirements for the FASM library are
correctly installed into the environment too.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 Makefile         | 11 +++++++++++
 requirements.txt |  1 +
 third_party/fasm |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f489e492..9c49b52f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,19 @@ ALL_EXCLUDE = third_party .git env build
 IN_ENV = if [ -e env/bin/activate ]; then . env/bin/activate; fi;
 env:
 	virtualenv --python=python3 --system-site-packages env
+	# Install prjxray
+	ln -sf $(PWD)/prjxray env/lib/python3.*/site-packages/
+	$(IN_ENV) python -c "import prjxray"
+	# Install fasm from third_party
+	$(IN_ENV) pip install --upgrade -e third_party/fasm
+	# Install project dependencies
 	$(IN_ENV) pip install -r requirements.txt
+	# Install project's documentation dependencies
 	$(IN_ENV) pip install -r docs/requirements.txt
+	# Check fasm library was installed
+	$(IN_ENV) python -c "import fasm"
+	$(IN_ENV) python -c "import fasm.output"
+	# Check YAML is installed
 	$(IN_ENV) python -c "import yaml" || (echo "Unable to find python-yaml" && exit 1)
 
 build:
diff --git a/requirements.txt b/requirements.txt
index 4d2cab1c..38eeb09b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+fasm
 futures
 intervaltree
 numpy
diff --git a/third_party/fasm b/third_party/fasm
index ece57149..ddc281a4 160000
--- a/third_party/fasm
+++ b/third_party/fasm
@@ -1 +1 @@
-Subproject commit ece57149c96cea82ab155af3bba04e76eee4ab6a
+Subproject commit ddc281a41662bff3efb4a66c5b22307e31e5df44