Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jan 2020 01:10:39 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r522178 - in head/cad/cascade-compiler: . files
Message-ID:  <202001060110.0061AdOh005628@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Mon Jan  6 01:10:39 2020
New Revision: 522178
URL: https://svnweb.freebsd.org/changeset/ports/522178

Log:
  cad/cascade-compiler: Update g20200105 -> g20200105.1

Deleted:
  head/cad/cascade-compiler/files/patch-src_CMakeLists.txt
Modified:
  head/cad/cascade-compiler/Makefile
  head/cad/cascade-compiler/distinfo
  head/cad/cascade-compiler/files/patch-CMakeLists.txt
  head/cad/cascade-compiler/pkg-descr
  head/cad/cascade-compiler/pkg-plist

Modified: head/cad/cascade-compiler/Makefile
==============================================================================
--- head/cad/cascade-compiler/Makefile	Mon Jan  6 01:06:42 2020	(r522177)
+++ head/cad/cascade-compiler/Makefile	Mon Jan  6 01:10:39 2020	(r522178)
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	cascade
-PORTVERSION=	g20200105
+PORTVERSION=	g20200105.1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-compiler
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES=	efe9940dcb93a6db6347ffd99225d52449e27c4d.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Just-In-Time Compiler for Verilog from VMware Research
 
@@ -22,7 +19,7 @@ TEST_DEPENDS=	benchmark>0:devel/benchmark \
 USES=		bison cmake compiler:c++17-lang localbase:ldflags ncurses perl5
 USE_GITHUB=	yes
 GH_ACCOUNT=	vmware
-GH_TAGNAME=	09fb6020329fc1d6d49b32ce3bbef241c52059f9
+GH_TAGNAME=	f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde
 
 MAKE_ENV=	FREEBSD_WRKSRC=${WRKSRC} FREEBSD_LOCALBASE=${LOCALBASE}
 
@@ -35,8 +32,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "*.h" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#include <FlexLexer.h>|#include <${LOCALBASE}/include/flex/FlexLexer.h>|'
 	# don't need bash: https://github.com/vmware/cascade/issues/207
 	@${FIND} ${WRKSRC} -name "*.sh" | ${XARGS} ${REINPLACE_CMD} -i '' 's|#!/bin/bash|#!/bin/sh|'
-	# replace the C++ compiler executable with CXX: https://github.com/vmware/cascade/issues/208
-	@${FIND} ${WRKSRC} -name "*.sh" | ${XARGS} ${REINPLACE_CMD} -i '' 's|g++ |${CXX} |'
 
 do-test:
 	cd ${BUILD_WRKSRC} && \

Modified: head/cad/cascade-compiler/distinfo
==============================================================================
--- head/cad/cascade-compiler/distinfo	Mon Jan  6 01:06:42 2020	(r522177)
+++ head/cad/cascade-compiler/distinfo	Mon Jan  6 01:10:39 2020	(r522178)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1578258073
-SHA256 (vmware-cascade-g20200105-09fb6020329fc1d6d49b32ce3bbef241c52059f9_GH0.tar.gz) = 045a1f09df8421953b81b783ec07f82dc3318f36b1b4be59cd9cc0ebe8a49711
-SIZE (vmware-cascade-g20200105-09fb6020329fc1d6d49b32ce3bbef241c52059f9_GH0.tar.gz) = 12258368
-SHA256 (efe9940dcb93a6db6347ffd99225d52449e27c4d.patch) = 6f3b59b1d313a4a7111c6dd8b0e70d180e3324890c3a4a01c297729d6d910b22
-SIZE (efe9940dcb93a6db6347ffd99225d52449e27c4d.patch) = 615
+TIMESTAMP = 1578272762
+SHA256 (vmware-cascade-g20200105.1-f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde_GH0.tar.gz) = b76107bebbe2c9f8737a652ff4e3c8ebf3fcbf13f672b34aa65c9899e7ab8442
+SIZE (vmware-cascade-g20200105.1-f4f7ae8bd1dd379790c0e58c286df90b8d1cdcde_GH0.tar.gz) = 12262109

Modified: head/cad/cascade-compiler/files/patch-CMakeLists.txt
==============================================================================
--- head/cad/cascade-compiler/files/patch-CMakeLists.txt	Mon Jan  6 01:06:42 2020	(r522177)
+++ head/cad/cascade-compiler/files/patch-CMakeLists.txt	Mon Jan  6 01:10:39 2020	(r522178)
@@ -1,6 +1,16 @@
---- CMakeLists.txt.orig	2020-01-04 03:07:22 UTC
+--- CMakeLists.txt.orig	2020-01-06 00:29:10 UTC
 +++ CMakeLists.txt
-@@ -42,5 +42,7 @@ include_directories(share/cascade)
+@@ -35,7 +35,8 @@ set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-cove
+ set(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
+ endif()
+ 
+-include_directories(${FLEX_INCLUDE_DIRS})
++#include_directories(${FLEX_INCLUDE_DIRS}) # cmake always finds base flex header:  https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243068
++include_directories(${CMAKE_INSTALL_PREFIX}/include/flex)
+ include_directories(${CMAKE_BINARY_DIR}/src)
+ include_directories(.)
+ include_directories(src/cascade)
+@@ -43,5 +44,7 @@ include_directories(src/cascade)
  add_subdirectory(include)
  add_subdirectory(share)
  add_subdirectory(src)

Modified: head/cad/cascade-compiler/pkg-descr
==============================================================================
--- head/cad/cascade-compiler/pkg-descr	Mon Jan  6 01:06:42 2020	(r522177)
+++ head/cad/cascade-compiler/pkg-descr	Mon Jan  6 01:10:39 2020	(r522178)
@@ -1,9 +1,11 @@
-Cascade is a novel solution to this problem, the world's first just-in-time
-compiler for Verilog. Cascade executes code immediately in a software simulator,
-and performs compilation in the background. When compilation is finished,
-the code is moved into hardware, and from the user's perspective it simply
-getsfaster over time. Cascade's ability to move code back and forth between
-software and hardware also makes it the first platform to provide generic
-support for the execution of unsynthesizable Verilog from hardware.
+Cascade is a novel solution to the problem that FPGAs take a long time to
+program, with complex programs taking hours to be compiled to run on FPGA.
+Cascade is a first just-in-time compiler for Verilog. Cascade executes code
+immediately in a software simulator, and performs compilation in the
+background. When compilation is finished, the code is moved into hardware, and
+from the user's perspective it simply gets faster over time. Cascade's ability
+to move code back and forth between software and hardware also makes it the
+first platform to provide generic support for the execution of unsynthesizable
+Verilog from hardware.
 
 WWW: https://github.com/vmware/cascade

Modified: head/cad/cascade-compiler/pkg-plist
==============================================================================
--- head/cad/cascade-compiler/pkg-plist	Mon Jan  6 01:06:42 2020	(r522177)
+++ head/cad/cascade-compiler/pkg-plist	Mon Jan  6 01:10:39 2020	(r522178)
@@ -60,8 +60,10 @@ include/cascade/target/core/avmm/de10/de10_gpio.h
 include/cascade/target/core/avmm/de10/de10_led.h
 include/cascade/target/core/avmm/de10/de10_logic.h
 include/cascade/target/core/avmm/de10/de10_pad.h
+include/cascade/target/core/avmm/de10/hps.h
 include/cascade/target/core/avmm/de10/io.h
 include/cascade/target/core/avmm/de10/quartus_server.h
+include/cascade/target/core/avmm/de10/socal.h
 include/cascade/target/core/avmm/machinify.h
 include/cascade/target/core/avmm/rewrite.h
 include/cascade/target/core/avmm/text_mangle.h
@@ -209,8 +211,6 @@ lib/libcascade.a
 %%DATADIR%%/de10/generate_hps_qsys_header.sh
 %%DATADIR%%/de10/hps_common_board_info.xml
 %%DATADIR%%/de10/hps_sdram_p0_summary.csv
-%%DATADIR%%/de10/include/hps.h
-%%DATADIR%%/de10/include/socal.h
 %%DATADIR%%/de10/ip/altsource_probe/hps_reset.qip
 %%DATADIR%%/de10/ip/altsource_probe/hps_reset.v
 %%DATADIR%%/de10/ip/altsource_probe/hps_reset_bb.v



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001060110.0061AdOh005628>