salfter/portage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sci-electronics/yosys: version bump (and fixed dependencies)

Browse Source
This commit is contained in:
Scott Alfter
2025-05-30 15:37:32 +00:00
parent 70d97420d9
commit 746c7f794f
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sci-electronics/yosys/files/yosys-makefile.patch
View File

@@ -1,10 +1,10 @@
--- a/Makefile 2024-08-14 14:36:42.000000000 -0700
+++ a/Makefile 2024-08-14 14:38:01.079046045 -0700
@@ -785,27 +785,7 @@
--- a/Makefile 2025-05-30 15:20:29.000000000 -0000
+++ a/Makefile 2025-05-30 15:21:14.951998447 -0000
@@ -792,42 +792,7 @@
.PHONY: check-git-abc
check-git-abc:
- @if [ ! -d "$(YOSYS_SRC)/abc" ]; then \
- @if [ ! -d "$(YOSYS_SRC)/abc" ] && git -C "$(YOSYS_SRC)" status >/dev/null 2>&1; then \
- echo "Error: The 'abc' directory does not exist."; \
- echo "Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
- exit 1; \
@@ -13,6 +13,15 @@
- elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && ! grep -q '\$$Format:%[hH]\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
- echo "'abc' comes from a tarball. Continuing."; \
- exit 0; \
- elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^+'; then \
- echo "'abc' submodule does not match expected commit."; \
- echo "Run 'git submodule update' to check out the correct version."; \
- echo "Note: If testing a different version of abc, call 'git commit abc' in the Yosys source directory to update the expected commit."; \
- exit 1; \
- elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^U'; then \
- echo "'abc' submodule has merge conflicts."; \
- echo "Please resolve merge conflicts before continuing."; \
- exit 1; \
- elif [ -f "$(YOSYS_SRC)/abc/.gitcommit" ] && grep -q '\$$Format:%[hH]\$$' "$(YOSYS_SRC)/abc/.gitcommit"; then \
- echo "Error: 'abc' is not configured as a git submodule."; \
- echo "To resolve this:"; \
@@ -21,11 +30,17 @@
- echo "3. Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
- echo "4. Reapply your changes: Move your saved changes back to the 'abc' directory, if necessary."; \
- exit 1; \
- elif ! git -C "$(YOSYS_SRC)" status >/dev/null 2>&1; then \
- echo "$(realpath $(YOSYS_SRC)) is not configured as a git repository, and 'abc' folder is missing."; \
- echo "If you already have ABC, set 'ABCEXTERNAL' make variable to point to ABC executable."; \
- echo "Otherwise, download release archive 'yosys.tar.gz' from https://github.com/YosysHQ/yosys/releases."; \
- echo " ('Source code' archive does not contain submodules.)"; \
- exit 1; \
- else \
- echo "Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
- exit 1; \
- fi
+ exit 0;
abc/abc$(EXE) abc/libabc.a: check-git-abc
abc/abc$(EXE) abc/libabc.a: | check-git-abc
$(P)

2
sci-electronics/yosys/yosys-0.48.ebuild → sci-electronics/yosys/yosys-0.53.ebuild
View File

@@ -14,7 +14,7 @@ PATCHES=( $FILESDIR/$PN-makefile.patch )
DEPEND="dev-vcs/git
media-gfx/xdot
dev-libs/boost
sys-devel/clang"
dev-lang/tcl"
src_compile()
{

2
sci-electronics/yosys/yosys-9999.ebuild
View File

@@ -13,7 +13,7 @@ PATCHES=( $FILESDIR/$PN-makefile.patch )
DEPEND="dev-vcs/git
media-gfx/xdot
dev-libs/boost
sys-devel/clang"
dev-lang/tcl"
src_compile()
{