From 287e33a47fc222c7092b06d4843c85c54e2a8c80 Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 11 Jul 2020 05:28:19 +0000 Subject: [PATCH] Add a PROGRAM_PREFIX= Makefile option for packages with prefixed Yosys. --- Makefile | 2 ++ sbysrc/sby_core.py | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 790170b..8f19bd5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ DESTDIR = PREFIX = /usr/local +PROGRAM_PREFIX = # On Windows, manually setting absolute path to Python binary may be required # for launcher executable to work. From MSYS2, this can be done using the @@ -28,6 +29,7 @@ install: mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/share/yosys/python3 cp sbysrc/sby_*.py $(DESTDIR)$(PREFIX)/share/yosys/python3/ + sed -e 's|##yosys-program-prefix##|"'$(PROGRAM_PREFIX)'"|' -i $(DESTDIR)$(PREFIX)/share/yosys/python3/sby_core.py ifeq ($(OS), Windows_NT) sed -e 's|##yosys-sys-path##|sys.path += [os.path.dirname(__file__) + p for p in ["/share/python3", "/../share/yosys/python3"]]|;' \ -e "s|#!/usr/bin/env python3|#!$(PYTHON)|" < sbysrc/sby.py > $(DESTDIR)$(PREFIX)/bin/sby-script.py diff --git a/sbysrc/sby_core.py b/sbysrc/sby_core.py index a23ebf0..bf1b66e 100644 --- a/sbysrc/sby_core.py +++ b/sbysrc/sby_core.py @@ -220,10 +220,11 @@ class SbyJob: self.total_time = 0 self.expect = [] + yosys_program_prefix = "" ##yosys-program-prefix## self.exe_paths = { - "yosys": os.getenv("YOSYS", "yosys"), - "abc": os.getenv("ABC", "yosys-abc"), - "smtbmc": os.getenv("SMTBMC", "yosys-smtbmc"), + "yosys": os.getenv("YOSYS", yosys_program_prefix + "yosys"), + "abc": os.getenv("ABC", yosys_program_prefix + "yosys-abc"), + "smtbmc": os.getenv("SMTBMC", yosys_program_prefix + "yosys-smtbmc"), "suprove": os.getenv("SUPROVE", "suprove"), "aigbmc": os.getenv("AIGBMC", "aigbmc"), "avy": os.getenv("AVY", "avy"), -- 2.30.2