cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

yosys: 0.36 -> 0.37

Browse source 
https://github.com/YosysHQ/yosys/releases/tag/yosys-0.37

The change to the patch is needed to fix this error on macOS:
```
+ clang -std=c++11 -O2 -o cxxrtl-test-value -I../../backends/cxxrtl/runtime test_value.cc -lstdc++
test_value.cc:1:10: fatal error: 'cassert' file not found
         ^~~~~~~~~
1 error generated.
make: *** [Makefile:891: test] Error 1
```
This commit is contained in:
Luflosi 2024-01-16 12:27:20 +01:00 committed by Austin Seipp
parent a6f96f04c8
commit 46692a1507
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/yosys/default.nix
View file

@ -77,13 +77,13 @@ let
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "yosys"; pname = "yosys";
version = "0.36"; version = "0.37";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "YosysHQ"; owner = "YosysHQ";
repo = "yosys"; repo = "yosys";
rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-jcaXn77OuKeC3AQTicILP3ABkJ3qBccM+uGbj1wn2Vw="; hash = "sha256-JRztXMZMBFhdZMeVHkRxFulRrFzyuNaLzcRlmgAz6Gc=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

15
pkgs/development/compilers/yosys/fix-clang-build.patch
View file

@ -1,5 +1,3 @@
diff --git a/Makefile b/Makefile
index fa95b7b70..4d15ed721 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT" @@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT"
@ -11,8 +9,17 @@ index fa95b7b70..4d15ed721 100644
LD = clang++ LD = clang++
CXXFLAGS += -std=$(CXXSTD) -Os CXXFLAGS += -std=$(CXXSTD) -Os
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)" ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)"
diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh --- a/tests/cxxrtl/run-test.sh
index 914a72347..bc0b129d2 100644 +++ b/tests/cxxrtl/run-test.sh
@@ -5,7 +5,7 @@ set -ex
run_subtest () {
local subtest=$1; shift
- ${CC:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++
+ ${CXX:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++
./cxxrtl-test-${subtest}
}
--- a/tests/fmt/run-test.sh --- a/tests/fmt/run-test.sh
+++ b/tests/fmt/run-test.sh +++ b/tests/fmt/run-test.sh
@@ -51,7 +51,7 @@ test_cxxrtl () { @@ -51,7 +51,7 @@ test_cxxrtl () {