From 51621439a4fc0da2a686b7cccf623340dbc42b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Thu, 6 Jun 2024 11:25:56 +0000 Subject: [PATCH] marlin: improve build --- server/Makefile-marlin | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/server/Makefile-marlin b/server/Makefile-marlin index 8b4333e8..816546af 100644 --- a/server/Makefile-marlin +++ b/server/Makefile-marlin @@ -1,13 +1,11 @@ marlin_commit := 2f6d7c10e124b3c5fa29ff8d77d568bd7af3274c -marlin: - # Clone marlin - pip install packaging - git clone https://github.com/IST-DASLab/marlin.git marlin - -build-marlin: marlin - cd marlin && git fetch && git checkout $(marlin_commit) - cd marlin && python setup.py build +build-marlin: + if [ ! -d 'marlin' ]; then \ + pip install -U ninja packaging --no-cache-dir && \ + git clone https://github.com/IST-DASLab/marlin.git marlin; \ + fi + cd marlin && git fetch && git checkout $(marlin_commit) && python setup.py build install-marlin: build-marlin - cd marlin && python setup.py install + cd marlin && git fetch && git checkout $(marlin_commit) && pip install -e .