Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171157995212730"
MIME-Version: 1.0
Date: Wed, 27 Mar 2024 22:52:32 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/yosys
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240327225232.B5E57FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171157995212730
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed Mar 27 22:52:32 UTC 2024

Modified Files:
	pkgsrc/devel/yosys: Makefile distinfo
Added Files:
	pkgsrc/devel/yosys/patches: patch-misc_yosys-config.in

Log Message:
yosys: fix interpreter in yosys-config script

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/yosys/Makefile \
    pkgsrc/devel/yosys/distinfo
cvs rdiff -u -r0 -r1.1 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.


--_----------=_171157995212730
Content-Disposition: inline
Content-Length: 3080
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/yosys/Makefile
diff -u pkgsrc/devel/yosys/Makefile:1.2 pkgsrc/devel/yosys/Makefile:1.3
--- pkgsrc/devel/yosys/Makefile:1.2	Sat Mar  2 23:08:00 2024
+++ pkgsrc/devel/yosys/Makefile	Wed Mar 27 22:52:32 2024
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2024/03/02 23:08:00 thorpej Exp $
+# $NetBSD: Makefile,v 1.3 2024/03/27 22:52:32 wiz Exp $
 
 YOSYS_VERSION=	0.38
 YOSYS_TAG=	yosys-${YOSYS_VERSION}
 ABC_DISTNAME=	abc-${YOSYS_TAG}
 DISTNAME=	${YOSYS_TAG}
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=YosysHQ/}
 GITHUB_TAG=	${YOSYS_TAG}
 WRKSRC=		${WRKDIR}/yosys-${YOSYS_TAG}
 EXTRACT_SUFX=	.tar.gz		# needed early
 
-PKGREVISION=	1
-
 MAINTAINER=	thorpej@NetBSD.org
 HOMEPAGE=	https://github.com/YosysHQ/yosys
 COMMENT=	Yosys Open SYnthesis Suite
@@ -32,12 +31,13 @@ SITES.${ABC_DISTFILE}=	-${MASTER_SITE_GI
 EXTRACT_DIR.${ABC_DISTFILE}=		${WRKSRC}/abc
 EXTRACT_OPTS_TAR.${ABC_DISTFILE}=	--strip-components=1
 
-.if !empty(CC_VERSION:Mclang*)
+.if ${CC_VERSION:Mclang*}
 YOSYS_COMPILER=	clang
 .else
 YOSYS_COMPILER=	gcc
 .endif
 
+USE_TOOLS+=	bash
 USE_TOOLS+=	gmake
 USE_TOOLS+=	bison
 USE_TOOLS+=	flex
@@ -65,6 +65,8 @@ REPLACE_PYTHON+=	tests/realmath/*.py
 REPLACE_PYTHON+=	tests/share/*.py
 REPLACE_PYTHON+=	tests/tools/*.py
 
+REPLACE_BASH+=		misc/yosys-config.in
+
 do-configure:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} config-${YOSYS_COMPILER}
 
Index: pkgsrc/devel/yosys/distinfo
diff -u pkgsrc/devel/yosys/distinfo:1.2 pkgsrc/devel/yosys/distinfo:1.3
--- pkgsrc/devel/yosys/distinfo:1.2	Sat Mar  2 23:08:00 2024
+++ pkgsrc/devel/yosys/distinfo	Wed Mar 27 22:52:32 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2024/03/02 23:08:00 thorpej Exp $
+$NetBSD: distinfo,v 1.3 2024/03/27 22:52:32 wiz Exp $
 
 BLAKE2s (abc-yosys-0.38.tar.gz) = 4bfbb01053192c417143c922de5a4f1d823aba17a6f818a20cacddb56772f486
 SHA512 (abc-yosys-0.38.tar.gz) = 4f13454658a538085b5aebec0c92aa32f45fd0fa2777fa2180471120af336dd17b4007fab4597bdff787d29581635b698be373e81a504b9998576b0e55c8a191
@@ -8,3 +8,4 @@ SHA512 (yosys-0.38.tar.gz) = d41b81593a7
 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

Added files:

Index: pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in
diff -u /dev/null pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in:1.1
--- /dev/null	Wed Mar 27 22:52:32 2024
+++ pkgsrc/devel/yosys/patches/patch-misc_yosys-config.in	Wed Mar 27 22:52:32 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-misc_yosys-config.in,v 1.1 2024/03/27 22:52:32 wiz 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
+ 	help
+ fi
+ 
+-if [ "$1" == "--build" ]; then
++if [ "$1" = "--build" ]; then
+ 	modname="$2"; shift 2
+ 	set -- --exec --cxx --cxxflags --ldflags -o "$modname" -shared "$@" --ldlibs
+ fi


--_----------=_171157995212730--