verilator, bump version (#6987)

This commit is contained in:
Schrijvers Luc
2022-06-10 19:45:49 +02:00
committed by GitHub
parent a9f27806a2
commit a821b6bd11
4 changed files with 7 additions and 212 deletions

View File

@@ -1,94 +0,0 @@
From 45be9ebce2e7be9683240e2ae1c720f79643c1c2 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 23 Oct 2014 18:35:32 +0000
Subject: [PATCH] Haiku: Add strings.h for strcasecmp
* Drop static -lm
---
src/Makefile_obj.in | 2 +-
src/V3Error.cpp | 1 +
src/V3Options.cpp | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in
index 57685d9..6a3044e 100644
--- a/src/Makefile_obj.in
+++ b/src/Makefile_obj.in
@@ -85,7 +85,7 @@ endif
#CCMALLOC = /usr/local/lib/ccmalloc-gcc.o -lccmalloc -ldl
# -lfl not needed as Flex invoked with %nowrap option
-LIBS = -lm
+LIBS =
CPPFLAGS += -MMD
CPPFLAGS += -I. -I$(bldsrc) -I$(srcdir) -I$(incdir)
diff --git a/src/V3Error.cpp b/src/V3Error.cpp
index 8eb7c56..c907c64 100644
--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@@ -21,6 +21,7 @@
#include <cstdio>
#include <cstdarg>
#include <cstring>
+#include <strings.h>
#include <set>
#include "V3Error.h"
#ifndef _V3ERROR_NO_GLOBAL_
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index 7c31676..85cf301 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -29,6 +29,7 @@
#include <dirent.h>
#include <unistd.h>
#include <fcntl.h>
+#include <strings.h>
#include <set>
#include <list>
#include <map>
--
1.8.3.4
From 4d07f6a4a4db515074356809f3f1d21d1d15b4a0 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 23 Oct 2014 19:08:44 +0000
Subject: [PATCH] Verilator: Fix hardcoded libmath in verilated.mk
---
include/verilated.mk.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/verilated.mk.in b/include/verilated.mk.in
index 87feb6d..9cedcba 100644
--- a/include/verilated.mk.in
+++ b/include/verilated.mk.in
@@ -108,7 +108,7 @@ endif
ifeq ($(VM_SP),1)
CPPFLAGS += -I$(SYSTEMPERL_INCLUDE) -DSYSTEMPERL
VPATH += $(SYSTEMPERL_INCLUDE)
- LIBS += -lm -lstdc++
+ LIBS += -lstdc++
VK_CLASSES_SP = $(addsuffix .sp, $(VM_CLASSES))
@@ -129,14 +129,14 @@ endif
##### SystemC w/o SystemPerl builds
ifeq ($(VM_SC),1)
- LIBS += -lm -lstdc++
+ LIBS += -lstdc++
endif
#######################################################################
##### C/H builds
ifeq ($(VM_PCLI),1)
- LIBS += -lm -lstdc++
+ LIBS += -lstdc++
endif
#######################################################################
--
1.8.3.4

View File

@@ -1,56 +0,0 @@
From 5efa36f87b22bd52e34a78c02b85123cc493bcd0 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 23 Oct 2014 18:35:32 +0000
Subject: Haiku: Add strings.h for strcasecmp
diff --git a/src/V3Error.cpp b/src/V3Error.cpp
index b12f5b8..4c0c090 100644
--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@@ -21,6 +21,7 @@
#include <cstdio>
#include <cstdarg>
#include <cstring>
+#include <strings.h>
#include <set>
#include "V3Error.h"
#ifndef _V3ERROR_NO_GLOBAL_
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index 11dc0a9..8de652f 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -29,6 +29,7 @@
#include <dirent.h>
#include <unistd.h>
#include <fcntl.h>
+#include <strings.h>
#include <set>
#include <list>
#include <map>
--
2.16.4
From 473b5567b0202da9d4c72766a6dfa66c25273aa5 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 7 Jul 2018 17:45:04 +0200
Subject: fix path for pkg-config
diff --git a/verilator.pc.in b/verilator.pc.in
index 2b3ba70..c8aef2b 100644
--- a/verilator.pc.in
+++ b/verilator.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
datarootdir=@datarootdir@
-includedir=@pkgdatadir@/include
+includedir=@includedir@
Name: verilator
Description: fast free Verilog simulator
--
2.16.4

View File

@@ -1,56 +0,0 @@
SUMMARY="A fast C++ Verilog simulator"
DESCRIPTION="Verilator is the fastest free Verilog HDL simulator, and \
beats most commercial simulators. It compiles synthesizable Verilog (not \
test-bench code!), plus some PSL, SystemVerilog and Synthesis assertions \
into C++ or SystemC code. It is designed for large projects where fast \
simulation performance is of primary concern, and is especially well suited \
to generate executable models of CPUs for embedded software design teams."
HOMEPAGE="https://www.veripool.org/wiki/verilator"
COPYRIGHT="2006-2014 Wilson Snyder"
LICENSE="GNU GPL v3"
REVISION="3"
SOURCE_URI="http://www.veripool.org/ftp/verilator-3.864.tgz"
CHECKSUM_SHA256="f6734c2aa33946357d5abfd9211b4206297f9adf07dfc3186cbbba0d8c8842af"
PATCHES="verilator-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
verilator$secondaryArchSuffix = $portVersion
cmd:verilator$secondaryArchSuffix
cmd:verilator_bin$secondaryArchSuffix
cmd:verilator_bin_dbg$secondaryArchSuffix
cmd:verilator_profcfunc$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:awk
cmd:bison
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:perl
"
BUILD()
{
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
}
TEST()
{
make check
}

View File

@@ -6,12 +6,11 @@ into C++ or SystemC code. It is designed for large projects where fast \
simulation performance is of primary concern, and is especially well suited \
to generate executable models of CPUs for embedded software design teams."
HOMEPAGE="https://www.veripool.org/"
COPYRIGHT="2006-2018 Wilson Snyder"
COPYRIGHT="2003-2022 Wilson Snyder"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://www.veripool.org/ftp/verilator-$portVersion.tgz"
CHECKSUM_SHA256="7dcb19711b8630ada59f0d3d7409faa9649e37bf4c53a0bbfcad32afb28b5975"
PATCHES="verilator-$portVersion.patchset"
SOURCE_URI="https://github.com/verilator/verilator/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="15c60175807c0f3536c3c5b435f131c2b1e8725aefd30645efd946bf401b4c84"
ARCHITECTURES="all !x86_gcc2"
if [ "$targetArchitecture" = x86_gcc2 ]; then
@@ -30,6 +29,7 @@ PROVIDES="
cmd:verilator_bin_dbg = $portVersion
cmd:verilator_coverage = $portVersion
cmd:verilator_coverage_bin_dbg = $portVersion
cmd:verilator_gantt = $portVersion
cmd:verilator_profcfunc = $portVersion
"
REQUIRES="
@@ -40,12 +40,14 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:autoconf
cmd:awk
cmd:bison
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:perl
cmd:python3
"
PATCH()
@@ -58,6 +60,7 @@ PATCH()
BUILD()
{
autoconf
runConfigure --omit-dirs "binDir" ./configure \
--bindir="$commandBinDir"
make $jobArgs
@@ -69,8 +72,6 @@ INSTALL()
mkdir -p $developLibDir/pkgconfig $includeDir
mv $dataDir/pkgconfig/* $developLibDir/pkgconfig/
mv $dataDir/verilator/include/* $includeDir
rmdir $dataDir/{pkgconfig,verilator/include}
}
TEST()