Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1709101918296590"
MIME-Version: 1.0
Date: Wed, 28 Feb 2024 06:31:58 +0000
From: "Jason R Thorpe" <thorpej@netbsd.org>
Subject: CVS commit: pkgsrc/devel
To: pkgsrc-changes@NetBSD.org
Reply-To: thorpej@netbsd.org
Message-Id: <20240228063158.899ECFA27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	thorpej
Date:		Wed Feb 28 06:31:58 UTC 2024

Modified Files:
	pkgsrc/devel: Makefile
Added Files:
	pkgsrc/devel/nextpnr: distinfo nextpnr.mk
	pkgsrc/devel/nextpnr-ice40: DESCR Makefile PLIST
	pkgsrc/devel/nextpnr/patches: patch-common_kernel_command.cc

Log Message:
Add package for infrastructure for nextpnr, the Yosys portable FPGA place
and route tool.  Add a package for the Lattice iCE40 nextpnr back-end.


To generate a diff of this commit:
cvs rdiff -u -r1.4186 -r1.4187 pkgsrc/devel/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/nextpnr/distinfo \
    pkgsrc/devel/nextpnr/nextpnr.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/nextpnr-ice40/DESCR \
    pkgsrc/devel/nextpnr-ice40/Makefile pkgsrc/devel/nextpnr-ice40/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/nextpnr/patches/patch-common_kernel_command.cc

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


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

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.4186 pkgsrc/devel/Makefile:1.4187
--- pkgsrc/devel/Makefile:1.4186	Wed Feb 28 06:02:38 2024
+++ pkgsrc/devel/Makefile	Wed Feb 28 06:31:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4186 2024/02/28 06:02:38 thorpej Exp $
+# $NetBSD: Makefile,v 1.4187 2024/02/28 06:31:57 thorpej Exp $
 #
 
 COMMENT=	Development utilities
@@ -1155,6 +1155,8 @@ SUBDIR+=	netcdf
 SUBDIR+=	netcdf-cxx
 SUBDIR+=	netcdf-fortran
 SUBDIR+=	newfile
+SUBDIR+=	nextpnr
+SUBDIR+=	nextpnr-ice40
 SUBDIR+=	ninja-build
 SUBDIR+=	ninka
 SUBDIR+=	noweb

Added files:

Index: pkgsrc/devel/nextpnr/distinfo
diff -u /dev/null pkgsrc/devel/nextpnr/distinfo:1.1
--- /dev/null	Wed Feb 28 06:31:58 2024
+++ pkgsrc/devel/nextpnr/distinfo	Wed Feb 28 06:31:57 2024
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2024/02/28 06:31:57 thorpej Exp $
+
+BLAKE2s (nextpnr-0.7.tar.gz) = 27dfd76a6c8bc84b3178083a1b21bf4d542387a29ebaf533553121ac6c31a486
+SHA512 (nextpnr-0.7.tar.gz) = feb190d3a656c7bcdd2bcc1def9972e2c9bec7171a064308b16260240ce9f552eb03d907ef7d032a17ae7ef7e869950e7399c61df22ba36484a4cf2ef7ce7de2
+Size (nextpnr-0.7.tar.gz) = 4711765 bytes
+SHA1 (patch-common_kernel_command.cc) = 8e5125d465a23992a0f13b0a4e7e59efaa1e48d5
Index: pkgsrc/devel/nextpnr/nextpnr.mk
diff -u /dev/null pkgsrc/devel/nextpnr/nextpnr.mk:1.1
--- /dev/null	Wed Feb 28 06:31:58 2024
+++ pkgsrc/devel/nextpnr/nextpnr.mk	Wed Feb 28 06:31:57 2024
@@ -0,0 +1,34 @@
+# $NetBSD: nextpnr.mk,v 1.1 2024/02/28 06:31:57 thorpej Exp $
+
+NEXTPNR_VERSION=0.7
+DISTNAME=	nextpnr-${NEXTPNR_VERSION}
+PKGNAME=	nextpnr-${NEXTPNR_TARGET}-${NEXTPNR_VERSION}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=YosysHQ/}
+GITHUB_TAG=	${DISTNAME}
+WRKSRC=		${WRKDIR}/nextpnr-${DISTNAME}
+
+MAINTAINER?=	thorpej@NetBSD.org
+HOMEPAGE=	https://github.com/YosysHQ/nextpnr
+COMMENT?=	A portable FPGA place and route tool
+LICENSE=	isc
+
+DISTINFO_FILE?=	${.CURDIR}/../../devel/nextpnr/distinfo
+PATCHDIR?=	${.CURDIR}/../../devel/nextpnr/patches
+
+USE_LANGUAGES=	c c++
+USE_CMAKE=	yes
+
+CMAKE_ARGS+=	-DARCH=${NEXTPNR_TARGET}
+.if defined(NEXTPNR_TARGET_ARGS)
+CMAKE_ARGS+=	${NEXTPNR_TARGET_ARGS}
+.endif
+
+# Python 3.5 or later, including development libraries, Python 3.9 or
+# later required for nextpnr-himbaechel.
+PYTHON_VERSIONS_INCOMPATIBLE= 27 38
+
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/nextpnr-ice40/DESCR
diff -u /dev/null pkgsrc/devel/nextpnr-ice40/DESCR:1.1
--- /dev/null	Wed Feb 28 06:31:58 2024
+++ pkgsrc/devel/nextpnr-ice40/DESCR	Wed Feb 28 06:31:58 2024
@@ -0,0 +1,4 @@
+nextpnr is a portable FPGA place and route tool.  nextpnr aims to be a vendor
+neutral, timing driven, FOSS FPGA place and route tool.
+
+This is the package for the Lattice iCE40 family of FPGAs.
Index: pkgsrc/devel/nextpnr-ice40/Makefile
diff -u /dev/null pkgsrc/devel/nextpnr-ice40/Makefile:1.1
--- /dev/null	Wed Feb 28 06:31:58 2024
+++ pkgsrc/devel/nextpnr-ice40/Makefile	Wed Feb 28 06:31:58 2024
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2024/02/28 06:31:58 thorpej Exp $
+
+COMMENT=	A portable FPGA place and route tool for Lattice iCE40 devices
+
+NEXTPNR_TARGET=		ice40
+NEXTPNR_TARGET_ARGS=	-DICESTORM_INSTALL_PREFIX=${PREFIX}
+
+DEPENDS+=		icestorm>=0.0.20240227:../../devel/icestorm
+
+.include "../../devel/nextpnr/nextpnr.mk"
Index: pkgsrc/devel/nextpnr-ice40/PLIST
diff -u /dev/null pkgsrc/devel/nextpnr-ice40/PLIST:1.1
--- /dev/null	Wed Feb 28 06:31:58 2024
+++ pkgsrc/devel/nextpnr-ice40/PLIST	Wed Feb 28 06:31:58 2024
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2024/02/28 06:31:58 thorpej Exp $
+bin/nextpnr-ice40

Index: pkgsrc/devel/nextpnr/patches/patch-common_kernel_command.cc
diff -u /dev/null pkgsrc/devel/nextpnr/patches/patch-common_kernel_command.cc:1.1
--- /dev/null	Wed Feb 28 06:31:58 2024
+++ pkgsrc/devel/nextpnr/patches/patch-common_kernel_command.cc	Wed Feb 28 06:31:58 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-common_kernel_command.cc,v 1.1 2024/02/28 06:31:58 thorpej Exp $
+
+On NetBSD, also use KERN_PROC_PATHNAME to get the path to the executable.
+
+--- common/kernel/command.cc.orig	2024-02-28 04:07:47.135026596 +0000
++++ common/kernel/command.cc	2024-02-28 04:08:20.420487475 +0000
+@@ -61,7 +61,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/sysctl.h>
+ #endif
+ 
+@@ -90,7 +90,7 @@ std::string proc_self_dirname()
+         buflen--;
+     return std::string(path, buflen);
+ }
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ std::string proc_self_dirname()
+ {
+     int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};


--_----------=_1709101918296590--