Merge pull request #36 from open-tool-forge/bugfix/33-yosys-ver

make yosys version string compatible with nmigen

Author: edbordin

scripts/compile_yosys.sh

@@ -16,19 +16,18 @@ test -e $YOSYS || git clone $GIT_YOSYS $YOSYS
 git -C $YOSYS pull
 git -C $YOSYS checkout $VER
 git -C $YOSYS log -1
+GIT_REV=$(git -C $YOSYS rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
 
 # edbordin: it would be better to avoid running anything in the upstream folder but
 # this just makes life much easier...
 pushd $YOSYS
 if [ $ARCH == "darwin" ]; then
     OLDPATH=$PATH
-    # bumpversion needs GNU sed and wc
-    export PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$(brew --prefix)/opt/coreutils/libexec/gnubin:$PATH"
-    $MAKE bumpversion
+    # use GNU sed so we can reuse the same pattern
+    export PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH"
     sed -r -i 's/^(YOSYS_VER := [0-9]+\.[0-9]+\+[0-9]+).*$/\1 \(open-tool-forge build\)/;' Makefile
     export PATH=$OLDPATH
 else
-    $MAKE bumpversion
     sed -r -i 's/^(YOSYS_VER := [0-9]+\.[0-9]+\+[0-9]+).*$/\1 \(open-tool-forge build\)/;' Makefile
 fi
 popd
@@ -66,7 +65,7 @@ if [ $ARCH == "darwin" ]; then
     echo "$MAKEFILE_CONF_GHDL" >> Makefile.conf
     sed -i "" "s/-Wall -Wextra -ggdb/-w/;" Makefile
     CXXFLAGS="-std=c++11 $CXXFLAGS" make \
-            -j$J PRETTY=0 \
+            -j$J GIT_REV="${GIT_REV}" PRETTY=0 \
             LDLIBS="-lm $PACKAGE_DIR/$NAME/lib/libghdl.a $(tr -s '\n' ' ' < $PACKAGE_DIR/$NAME/lib/libghdl.link)" \
             ENABLE_TCL=0 ENABLE_PLUGINS=0 ENABLE_READLINE=0 ENABLE_COVER=0 ENABLE_ZLIB=0 ENABLE_ABC=1 \
             ABCMKARGS="CC=\"$CC\" CXX=\"$CXX\" OPTFLAGS=\"-O\" \
@@ -76,7 +75,7 @@ if [ $ARCH == "darwin" ]; then
 elif [ ${ARCH:0:7} == "windows" ]; then
     $MAKE config-msys2-64
     echo "$MAKEFILE_CONF_GHDL" >> Makefile.conf
-    $MAKE -j$J PRETTY=0 \
+    $MAKE -j$J GIT_REV="${GIT_REV}" PRETTY=0 \
               LDLIBS="-static -lstdc++ -lm $(cygpath -m -a $PACKAGE_DIR/$NAME/lib/libghdl.a) $((tr -s '\n' ' ' | tr -s '\\' '/') < $PACKAGE_DIR/$NAME/lib/libghdl.link)" \
               ABCMKARGS="CC=\"$CC\" CXX=\"$CXX\" LIBS=\"-static -lm\" OPTFLAGS=\"-O\" \
                          ARCHFLAGS=\"$ABC_ARCHFLAGS\" \
@@ -93,7 +92,7 @@ else
     # sed -i "s/LD = gcc$/LD = $CC/;" Makefile
     # sed -i "s/CXX = gcc$/CXX = $CC/;" Makefile
     # sed -i "s/LDFLAGS += -rdynamic/LDFLAGS +=/;" Makefile
-    $MAKE -j$J PRETTY=0 \
+    $MAKE -j$J GIT_REV="${GIT_REV}" PRETTY=0 \
                 LDLIBS="-static -lstdc++ -lm $PACKAGE_DIR/$NAME/lib/libghdl.a $(tr -s '\n' ' ' < $PACKAGE_DIR/$NAME/lib/libghdl.link) -ldl" \
                 ENABLE_TCL=0 ENABLE_PLUGINS=0 ENABLE_READLINE=0 ENABLE_COVER=0 ENABLE_ZLIB=0 ENABLE_ABC=1 \
                 ABCMKARGS="CC=\"$CC\" CXX=\"$CXX\" LIBS=\"-static -lm -ldl -pthread\" \

scripts/install_dependencies.sh

@@ -93,7 +93,7 @@ if [ $ARCH == "darwin" ]; then
     # yosys detects some of these tools if a homebrew version is installed
     # so we may not need to add all of them to PATH
     brew install automake pkg-config bison flex gawk libffi git graphviz xdot bash cmake boost boost-python3 eigen \
-        libftdi libusb zlib libedit ncurses bzip2 gnu-sed coreutils
+        libftdi libusb zlib libedit ncurses bzip2 gnu-sed
 
     wget --progress=dot https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-MacOSX-x86_64.sh -O miniconda.sh
     bash miniconda.sh -b -p /tmp/conda