pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/yosys
Module Name: pkgsrc
Committed By: thorpej
Date: Sat Sep 7 02:10:29 UTC 2024
Modified Files:
pkgsrc/devel/yosys: Makefile PLIST distinfo
pkgsrc/devel/yosys/patches: patch-misc_yosys-config.in
Added Files:
pkgsrc/devel/yosys/patches: patch-Makefile
Removed Files:
pkgsrc/devel/yosys/patches: patch-abc_Makefile patch-kernel_yosys.cc
Log Message:
Update to yosys-0.45.
Lots of upstream changes since 0.38. Go read here:
https://github.com/YosysHQ/yosys/releases
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/yosys/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/yosys/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/yosys/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/yosys/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/yosys/patches/patch-abc_Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/yosys/patches/patch-kernel_yosys.cc
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/yosys/Makefile
diff -u pkgsrc/devel/yosys/Makefile:1.5 pkgsrc/devel/yosys/Makefile:1.6
--- pkgsrc/devel/yosys/Makefile:1.5 Mon Apr 15 17:12:06 2024
+++ pkgsrc/devel/yosys/Makefile Sat Sep 7 02:10:28 2024
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2024/04/15 17:12:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/09/07 02:10:28 thorpej Exp $
-YOSYS_VERSION= 0.38
-YOSYS_TAG= yosys-${YOSYS_VERSION}
-ABC_DISTNAME= abc-${YOSYS_TAG}
-DISTNAME= ${YOSYS_TAG}
-PKGREVISION= 4
+# XXX Yosys changed their release tag format in 0.45 to just a bare
+# XXX number, sigh.
+YOSYS_VERSION= 0.45
+YOSYS_TAG= ${YOSYS_VERSION}
+ABC_TAG= yosys-${YOSYS_VERSION}
+ABC_DISTNAME= abc-${ABC_TAG}
+DISTNAME= yosys-${YOSYS_TAG}
+#PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=YosysHQ/}
GITHUB_TAG= ${YOSYS_TAG}
@@ -28,7 +31,7 @@ ABC_DISTFILE= ${ABC_DISTNAME}${EXTRACT_S
DISTFILES= ${DEFAULT_DISTFILES}
DISTFILES+= ${ABC_DISTFILE}
-SITES.${ABC_DISTFILE}= -${MASTER_SITE_GITHUB:=YosysHQ/abc/archive/}${GITHUB_TAG}${EXTRACT_SUFX}
+SITES.${ABC_DISTFILE}= -${MASTER_SITE_GITHUB:=YosysHQ/abc/archive/}${ABC_TAG}${EXTRACT_SUFX}
EXTRACT_DIR.${ABC_DISTFILE}= ${WRKSRC}/abc
EXTRACT_OPTS_TAR.${ABC_DISTFILE}= --strip-components=1
Index: pkgsrc/devel/yosys/PLIST
diff -u pkgsrc/devel/yosys/PLIST:1.1 pkgsrc/devel/yosys/PLIST:1.2
--- pkgsrc/devel/yosys/PLIST:1.1 Sat Mar 2 02:03:37 2024
+++ pkgsrc/devel/yosys/PLIST Sat Sep 7 02:10:28 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/02 02:03:37 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/09/07 02:10:28 thorpej Exp $
bin/yosys
bin/yosys-abc
bin/yosys-config
@@ -20,6 +20,7 @@ share/yosys/anlogic/eagle_bb.v
share/yosys/anlogic/lutrams.txt
share/yosys/anlogic/lutrams_map.v
share/yosys/cells.lib
+share/yosys/choices/kogge-stone.v
share/yosys/cmp2lcu.v
share/yosys/cmp2lut.v
share/yosys/cmp2softlogic.v
@@ -102,12 +103,15 @@ share/yosys/include/backends/cxxrtl/runt
share/yosys/include/backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi_vcd.cc
share/yosys/include/backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi_vcd.h
share/yosys/include/backends/cxxrtl/runtime/cxxrtl/cxxrtl.h
+share/yosys/include/backends/cxxrtl/runtime/cxxrtl/cxxrtl_replay.h
+share/yosys/include/backends/cxxrtl/runtime/cxxrtl/cxxrtl_time.h
share/yosys/include/backends/cxxrtl/runtime/cxxrtl/cxxrtl_vcd.h
share/yosys/include/backends/rtlil/rtlil_backend.h
share/yosys/include/frontends/ast/ast.h
share/yosys/include/frontends/ast/ast_binding.h
share/yosys/include/frontends/blif/blifparse.h
share/yosys/include/kernel/binding.h
+share/yosys/include/kernel/bitpattern.h
share/yosys/include/kernel/cellaigs.h
share/yosys/include/kernel/celledges.h
share/yosys/include/kernel/celltypes.h
@@ -129,10 +133,12 @@ share/yosys/include/kernel/qcsat.h
share/yosys/include/kernel/register.h
share/yosys/include/kernel/rtlil.h
share/yosys/include/kernel/satgen.h
+share/yosys/include/kernel/scopeinfo.h
share/yosys/include/kernel/sigtools.h
share/yosys/include/kernel/timinginfo.h
share/yosys/include/kernel/utils.h
share/yosys/include/kernel/yosys.h
+share/yosys/include/kernel/yosys_common.h
share/yosys/include/kernel/yw.h
share/yosys/include/libs/ezsat/ezminisat.h
share/yosys/include/libs/ezsat/ezsat.h
@@ -161,8 +167,6 @@ share/yosys/intel_alm/common/alm_sim.v
share/yosys/intel_alm/common/arith_alm_map.v
share/yosys/intel_alm/common/bram_m10k.txt
share/yosys/intel_alm/common/bram_m10k_map.v
-share/yosys/intel_alm/common/bram_m20k.txt
-share/yosys/intel_alm/common/bram_m20k_map.v
share/yosys/intel_alm/common/dff_map.v
share/yosys/intel_alm/common/dff_sim.v
share/yosys/intel_alm/common/dsp_map.v
@@ -171,7 +175,6 @@ share/yosys/intel_alm/common/lutram_mlab
share/yosys/intel_alm/common/megafunction_bb.v
share/yosys/intel_alm/common/mem_sim.v
share/yosys/intel_alm/common/misc_sim.v
-share/yosys/intel_alm/common/quartus_rename.v
share/yosys/intel_alm/cyclonev/cells_sim.v
share/yosys/lattice/arith_map_ccu2c.v
share/yosys/lattice/arith_map_ccu2d.v
@@ -197,7 +200,42 @@ share/yosys/lattice/dsp_map_18x18.v
share/yosys/lattice/latches_map.v
share/yosys/lattice/lutrams.txt
share/yosys/lattice/lutrams_map.v
+share/yosys/microchip/LSRAM.txt
+share/yosys/microchip/LSRAM_map.v
+share/yosys/microchip/arith_map.v
+share/yosys/microchip/brams_defs.vh
+share/yosys/microchip/cells_map.v
+share/yosys/microchip/cells_sim.v
+share/yosys/microchip/polarfire_dsp_map.v
+share/yosys/microchip/uSRAM.txt
+share/yosys/microchip/uSRAM_map.v
share/yosys/mul2dsp.v
+share/yosys/nanoxplore/arith_map.v
+share/yosys/nanoxplore/brams.txt
+share/yosys/nanoxplore/brams_init.vh
+share/yosys/nanoxplore/brams_map.v
+share/yosys/nanoxplore/cells_bb.v
+share/yosys/nanoxplore/cells_bb_l.v
+share/yosys/nanoxplore/cells_bb_m.v
+share/yosys/nanoxplore/cells_bb_u.v
+share/yosys/nanoxplore/cells_map.v
+share/yosys/nanoxplore/cells_sim.v
+share/yosys/nanoxplore/cells_sim_l.v
+share/yosys/nanoxplore/cells_sim_m.v
+share/yosys/nanoxplore/cells_sim_u.v
+share/yosys/nanoxplore/cells_wrap.v
+share/yosys/nanoxplore/cells_wrap_l.v
+share/yosys/nanoxplore/cells_wrap_m.v
+share/yosys/nanoxplore/cells_wrap_u.v
+share/yosys/nanoxplore/io_map.v
+share/yosys/nanoxplore/latches_map.v
+share/yosys/nanoxplore/rf_init.vh
+share/yosys/nanoxplore/rf_rams_l.txt
+share/yosys/nanoxplore/rf_rams_m.txt
+share/yosys/nanoxplore/rf_rams_map_l.v
+share/yosys/nanoxplore/rf_rams_map_m.v
+share/yosys/nanoxplore/rf_rams_map_u.v
+share/yosys/nanoxplore/rf_rams_u.txt
share/yosys/nexus/arith_map.v
share/yosys/nexus/brams.txt
share/yosys/nexus/brams_map.v
Index: pkgsrc/devel/yosys/distinfo
diff -u pkgsrc/devel/yosys/distinfo:1.3 pkgsrc/devel/yosys/distinfo:1.4
--- pkgsrc/devel/yosys/distinfo:1.3 Wed Mar 27 22:52:32 2024
+++ pkgsrc/devel/yosys/distinfo Sat Sep 7 02:10:28 2024
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.3 2024/03/27 22:52:32 wiz Exp $
+$NetBSD: distinfo,v 1.4 2024/09/07 02:10:28 thorpej Exp $
-BLAKE2s (abc-yosys-0.38.tar.gz) = 4bfbb01053192c417143c922de5a4f1d823aba17a6f818a20cacddb56772f486
-SHA512 (abc-yosys-0.38.tar.gz) = 4f13454658a538085b5aebec0c92aa32f45fd0fa2777fa2180471120af336dd17b4007fab4597bdff787d29581635b698be373e81a504b9998576b0e55c8a191
-Size (abc-yosys-0.38.tar.gz) = 6142623 bytes
-BLAKE2s (yosys-0.38.tar.gz) = bf794aef85cd8133d2ef4a47b802c6fb0a9c0744df2aa3c63f2fb2905f38d3ce
-SHA512 (yosys-0.38.tar.gz) = d41b81593a717bfd71c3120bb823a8bfb739f485e1a1ca3055e743e3f9f7406aa3c883a5a001183613f9ac05aaee222dafe39a594ead68c1c2fd74c3b2a84038
-Size (yosys-0.38.tar.gz) = 2709217 bytes
-SHA1 (patch-abc_Makefile) = b4cbe6b905f26e8bf7980e230edc87e12efced99
-SHA1 (patch-kernel_yosys.cc) = 35784013f6232990ff8c320ea43a0394baf03c90
-SHA1 (patch-misc_yosys-config.in) = d2f21421854b79036d336add2adc065278372b73
+BLAKE2s (abc-yosys-0.45.tar.gz) = 7d2fe097cb0edd288ed1bd5363f4c41384701cabb1d44870d59eb6660e3979ed
+SHA512 (abc-yosys-0.45.tar.gz) = 817c68a65af049fcc3c7f6f8bede0df921b198c36baaa117329be727f5fc215bc1434ca801fd162e3c4811b6d1e61b735f631d77b83faf5c0ce9507abcba55a7
+Size (abc-yosys-0.45.tar.gz) = 6245551 bytes
+BLAKE2s (yosys-0.45.tar.gz) = 9fce7cc6a50ed13dda709ee35bc187ca17fce6d7bea419c3f23629e6c6a8bb02
+SHA512 (yosys-0.45.tar.gz) = fd0ab67f69e61ea1479b0fbf61f8d860bed58f668ab61c925e8d82fda728b9615188e7bcb0541110d6e6b272feb6420737d19c5e2d6315263e0439f78e6915d1
+Size (yosys-0.45.tar.gz) = 2921074 bytes
+SHA1 (patch-Makefile) = 25314af236374e85faacc4b85625195bb743f83d
+SHA1 (patch-misc_yosys-config.in) = 791949d72e8eb441cb0f3779b47228872cc89986
Index: pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in
diff -u pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in:1.1 pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in:1.2
--- pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in:1.1 Wed Mar 27 22:52:32 2024
+++ pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in Sat Sep 7 02:10:29 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-misc_yosys-config.in,v 1.1 2024/03/27 22:52:32 wiz Exp $
+$NetBSD: patch-misc_yosys-config.in,v 1.2 2024/09/07 02:10:29 thorpej Exp $
Fix unportable test(1) operator.
---- misc/yosys-config.in.orig 2024-03-27 22:39:39.906540821 +0000
-+++ misc/yosys-config.in
-@@ -42,7 +42,7 @@ if [ $# -eq 0 ]; then
+--- misc/yosys-config.in.orig 2024-09-07 02:04:12.105679875 +0000
++++ misc/yosys-config.in 2024-09-07 02:04:20.346019658 +0000
+@@ -44,7 +44,7 @@ if [ $# -eq 0 ]; then
help
fi
-if [ "$1" == "--build" ]; then
+if [ "$1" = "--build" ]; then
modname="$2"; shift 2
- set -- --exec --cxx --cxxflags --ldflags -o "$modname" -shared "$@" --ldlibs
+ set -- --exec --cxx --cxxflags --ldflags -o "$modname" -shared "$@" --libs
fi
Added files:
Index: pkgsrc/devel/yosys/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/yosys/patches/patch-Makefile:1.1
--- /dev/null Sat Sep 7 02:10:29 2024
+++ pkgsrc/devel/yosys/patches/patch-Makefile Sat Sep 7 02:10:28 2024
@@ -0,0 +1,42 @@
+$NetBSD: patch-Makefile,v 1.1 2024/09/07 02:10:28 thorpej Exp $
+
+Disable the TCL shenanigans and just assume installed-by-pkgsrc.
+
+--- Makefile.orig 2024-09-03 10:28:25
++++ Makefile 2024-09-06 16:50:08
+@@ -432,15 +432,17 @@ TCL_VERSION ?= tcl$(shell bash -c "tclsh <(echo 'puts
+
+
+ ifeq ($(ENABLE_TCL),1)
+-TCL_VERSION ?= tcl$(shell bash -c "tclsh <(echo 'puts [info tclversion]')")
+-ifeq ($(OS), $(filter $(OS),FreeBSD OpenBSD NetBSD))
+-# BSDs usually use tcl8.6, but the lib is named "libtcl86"
+-TCL_INCLUDE ?= /usr/local/include/$(TCL_VERSION)
+-TCL_LIBS ?= -l$(subst .,,$(TCL_VERSION))
+-else
+-TCL_INCLUDE ?= /usr/include/$(TCL_VERSION)
+-TCL_LIBS ?= -l$(TCL_VERSION)
+-endif
++#TCL_VERSION ?= tcl$(shell bash -c "tclsh <(echo 'puts [info tclversion]')")
++#ifeq ($(OS), $(filter $(OS),FreeBSD OpenBSD NetBSD))
++## BSDs usually use tcl8.6, but the lib is named "libtcl86"
++#TCL_INCLUDE ?= /usr/local/include/$(TCL_VERSION)
++#TCL_LIBS ?= -l$(subst .,,$(TCL_VERSION))
++#else
++#TCL_INCLUDE ?= /usr/include/$(TCL_VERSION)
++#TCL_LIBS ?= -l$(TCL_VERSION)
++#endif
++TCL_INCLUDE ?= ${PREFIX}/include
++TCL_LIBS ?= -L ${PREFIX}/lib -ltcl86
+
+ ifeq ($(CONFIG),mxe)
+ CXXFLAGS += -DYOSYS_ENABLE_TCL
+@@ -734,7 +736,7 @@ $(PROGRAM_PREFIX)yosys$(EXE): $(OBJS)
+ @echo ""
+
+ $(PROGRAM_PREFIX)yosys$(EXE): $(OBJS)
+- $(P) $(CXX) -o $(PROGRAM_PREFIX)yosys$(EXE) $(EXE_LINKFLAGS) $(LINKFLAGS) $(OBJS) $(LIBS) $(LIBS_VERIFIC)
++ $(P) $(CXX) -v -o $(PROGRAM_PREFIX)yosys$(EXE) $(EXE_LINKFLAGS) $(LINKFLAGS) $(OBJS) $(LIBS) $(LIBS_VERIFIC)
+
+ libyosys.so: $(filter-out kernel/driver.o,$(OBJS))
+ ifeq ($(OS), Darwin)
Home |
Main Index |
Thread Index |
Old Index