pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

yosys-dev: upgraded to 0.49, builds without Makefile patch, removed patch



Module Name:	pkgsrc-wip
Committed By:	Mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Wed Jan 29 22:59:01 2025 +0530
Changeset:	9b5102824cde9ee14702a54d03a71c201f02a5be

Modified Files:
	yosys-dev/Makefile
	yosys-dev/distinfo
	yosys-dev/patches/patch-kernel_driver.cc
Removed Files:
	yosys-dev/patches/patch-Makefile

Log Message:
yosys-dev: upgraded to 0.49, builds without Makefile patch, removed patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9b5102824cde9ee14702a54d03a71c201f02a5be

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 yosys-dev/Makefile                       |  2 +-
 yosys-dev/distinfo                       |  9 +++----
 yosys-dev/patches/patch-Makefile         | 42 --------------------------------
 yosys-dev/patches/patch-kernel_driver.cc |  6 ++---
 4 files changed, 8 insertions(+), 51 deletions(-)

diffs:
diff --git a/yosys-dev/Makefile b/yosys-dev/Makefile
index 8a4f78560e..e16c86e030 100644
--- a/yosys-dev/Makefile
+++ b/yosys-dev/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.12 2024/10/22 11:29:50 thorpej Exp $
 
-YOSYS_VERSION=	0.48
+YOSYS_VERSION=	0.49
 GITHUB_PROJECT=	yosys
 DISTNAME=	yosys
 PKGNAME=	${DISTNAME}-${YOSYS_VERSION}
diff --git a/yosys-dev/distinfo b/yosys-dev/distinfo
index 1ba8ecdf97..5cb2c45b99 100644
--- a/yosys-dev/distinfo
+++ b/yosys-dev/distinfo
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.6 2024/10/15 01:32:59 thorpej Exp $
 
-BLAKE2s (yosys-0.48/yosys.tar.gz) = 8825f0caf86fdc907d5c036e4302ed120a49fddebb2ad6cb8d14d1f68a53e034
-SHA512 (yosys-0.48/yosys.tar.gz) = c76756171dcff7f7281e19ad94ffde7498965799841c68b21259d12ade78494f5c8be59b5278777fabe904321ae214c702fdaef9c49ee23a3fa109a59b4b0322
-Size (yosys-0.48/yosys.tar.gz) = 9679731 bytes
-SHA1 (patch-Makefile) = db77fa7d0274a1f11290e46ee92dfc80b7d88556
-SHA1 (patch-kernel_driver.cc) = 4b0b0ffd2a7e3757bdf87728460e34831f2075aa
+BLAKE2s (yosys-0.49/yosys.tar.gz) = 4b7d701275f6592e3a69be6234c0d1c7fd11a30f9274cd4321415a8f41265200
+SHA512 (yosys-0.49/yosys.tar.gz) = d716f0495899196947c3a2bdad10c7e0e39c3c0ab2f2600b701bd719edc3e9fa2d86a0eba12c59d9b28651a88563bd83dab4ce37d38ce984d4a74d6d17c1752b
+Size (yosys-0.49/yosys.tar.gz) = 9686496 bytes
+SHA1 (patch-kernel_driver.cc) = 0eccf6d43794b52b0baf28922edbc451bd35788a
 SHA1 (patch-kernel_tclapi.cc) = 1394b3ec7961bd5455ba8d9d22f10c3c24af4d04
diff --git a/yosys-dev/patches/patch-Makefile b/yosys-dev/patches/patch-Makefile
deleted file mode 100644
index 46b94ec829..0000000000
--- a/yosys-dev/patches/patch-Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2024/10/15 01:32:59 thorpej Exp $
-
-Disable the TCL shenanigans and just assume installed-by-pkgsrc.
-
---- Makefile.orig	2024-10-09 06:08:00.000000000 +0000
-+++ Makefile	2024-10-14 23:30:11.076057503 +0000
-@@ -433,15 +433,17 @@ endif
- 
- 
- 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
-@@ -738,7 +740,7 @@ compile-only: $(OBJS) $(GENFILES) $(EXTR
- 	@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)
diff --git a/yosys-dev/patches/patch-kernel_driver.cc b/yosys-dev/patches/patch-kernel_driver.cc
index 931cc03f64..39688b33b3 100644
--- a/yosys-dev/patches/patch-kernel_driver.cc
+++ b/yosys-dev/patches/patch-kernel_driver.cc
@@ -2,11 +2,11 @@ $NetBSD$
 
 pkgsrc cxxopts include path adjusted
 
---- kernel/driver.cc.orig	2024-11-19 15:16:25.907765578 +0000
+--- kernel/driver.cc.orig	2025-01-29 17:09:04.808014166 +0000
 +++ kernel/driver.cc
-@@ -19,7 +19,7 @@
- 
+@@ -20,7 +20,7 @@
  #include "kernel/yosys.h"
+ #include "kernel/hashlib.h"
  #include "libs/sha1/sha1.h"
 -#include "libs/cxxopts/include/cxxopts.hpp"
 +#include "cxxopts.hpp"


Home | Main Index | Thread Index | Old Index