syn/yosys: Link against zlib on Windows

After adding FST library in YosysHQ/yosys@9e9083b `zlib` is now required to build Yosys. Apart from that, `tk` and `zlib` are made explicit host requirements on Linux and macOS because these packages contain libraries Yosys is linked against. In fact, they may have been required for quite some time already. Both packages add themselves as `run` dependencies if used as `host` requirements so there's no need to have `tk` explicitly there.
hdl · Feb 11, 2022 · 2d767fd · 2d767fd
1 parent 7e3f2ba
commit 2d767fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/syn/yosys/bld.bat b/syn/yosys/bld.bat
@@ -39,13 +39,13 @@ mkdir tmp
 make -j5^
      YOSYS_VER="$VER (Fomu build)" ^
      ABCREV=default ^
-     LDLIBS="-static -lstdc++ -lm" ^
+     LDLIBS="-static -lstdc++ -lm -lz" ^
      ABCMKARGS=%ABC_ARGS% ^
      ENABLE_TCL=0 ^
      ENABLE_PLUGINS=0 ^
      ENABLE_READLINE=0 ^
      ENABLE_COVER=0 ^
-     ENABLE_ZLIB=0 ^
+     ENABLE_ZLIB=1 ^
      ENABLE_ABC=1 ^
 	 PREFIX=%BASH_PREFIX%
 

diff --git a/syn/yosys/meta.yaml b/syn/yosys/meta.yaml
@@ -53,16 +53,17 @@ requirements:
     - m2-bison 3.0.4       [win]
     - m2-flex 2.6.0        [win]
     - m2-libreadline 6.3   [win]
+    - m2-zlib              [win]
     - bison                [not win]
     - flex                 [not win]
     - libffi               [not win]
     - pkg-config           [not win]
+    - tk                   [not win]
+    - zlib                 [not win]
     - python {{ python_version }}
-    - tk   [osx]
     - gawk [osx]
   run:
     - python {{ python_version }}
-    - tk       [osx]
     - gawk     [osx]
     - iverilog [osx]