cad/openroad: Update 2.0 -> 2.0-2930

10 files changed, 53 insertions, 49 deletions

diff --git a/cad/openroad/Makefile b/cad/openroad/Makefile
index 6c89e4cf9684..4e01b07bbfe2 100644
--- a/cad/openroad/Makefile
+++ b/cad/openroad/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openroad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0
+DISTVERSION=	2.0-2930
+DISTVERSIONSUFFIX=	-gaa6d690df
 PORTEPOCH=	1
 CATEGORIES=	cad
 
@@ -15,26 +16,29 @@ BROKEN_i386=	C++ issue on i386, should be resolved in the next update
 BUILD_DEPENDS=	base64:converters/base64 \
 		boost-libs>0:devel/boost-libs \
 		coin-or-lemon>0:math/lemon \
+		gmake:devel/gmake \
 		swig:devel/swig
 LIB_DEPENDS=	libcudd.so:math/cudd \
 		libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog
 
-USES=		bison compiler:c++17-lang cmake eigen:3 qt:5 localbase:ldflags python:3.7+,build tcl:86 # the code asks for tcl-87, but build fails: https://github.com/The-OpenROAD-Project/OpenROAD/issues/508
+USES=		bison compiler:c++17-lang cmake eigen:3 qt:5 localbase:ldflags python:3.7+,build readline tcl:86 # the code asks for tcl-87, but build fails: https://github.com/The-OpenROAD-Project/OpenROAD/issues/508
 USE_QT=		core gui widgets buildtools_build qmake_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	The-OpenROAD-Project
 GH_PROJECT=	OpenROAD
-GH_TUPLE=	The-OpenROAD-Project:OpenSTA:be0d38e:The_OpenROAD_Project_OpenSTA/src/sta
+GH_TUPLE=	The-OpenROAD-Project:OpenSTA:d42313d:The_OpenROAD_Project_OpenSTA/src/sta \
+		The-OpenROAD-Project:abc:d1cd437:abc/third-party/abc
 
 CMAKE_OFF=	BUILD_PYTHON FREEBSD_BUILD_TESTS
 CMAKE_ON=	BUILD_TCL
 CMAKE_ARGS=	-DFREEBSD_TCL_VER=${TCL_VER:S/.//} -DFREEBSD_TCL_INCLUDEDIR=${TCL_INCLUDEDIR}
 
-CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
+CXXFLAGS+=	-I${LOCALBASE}/include/eigen3 \
+		-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
 
-BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
+BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH} make=${GMAKE}
 
 PLIST_FILES=	bin/openroad \
 		bin/sta
diff --git a/cad/openroad/distinfo b/cad/openroad/distinfo
index 7a7093820308..449820e86ffb 100644
--- a/cad/openroad/distinfo
+++ b/cad/openroad/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1627018650
-SHA256 (The-OpenROAD-Project-OpenROAD-v2.0_GH0.tar.gz) = 5926af338ba2adcda5e5e73b50feb9e4d98838aebf31fe91763dc74cf87cfbdc
-SIZE (The-OpenROAD-Project-OpenROAD-v2.0_GH0.tar.gz) = 222297114
-SHA256 (The-OpenROAD-Project-OpenSTA-be0d38e_GH0.tar.gz) = 301e8499ade5fd1a1db7c9565295f4b0fbffc70bd9a8ef439a5c48804480b34c
-SIZE (The-OpenROAD-Project-OpenSTA-be0d38e_GH0.tar.gz) = 4898566
+TIMESTAMP = 1644454985
+SHA256 (The-OpenROAD-Project-OpenROAD-v2.0-2930-gaa6d690df_GH0.tar.gz) = 3b60d1deccf2e3c28a6b52b29ebdf2f55738ea2294d49e1c1f22c6356b6d012a
+SIZE (The-OpenROAD-Project-OpenROAD-v2.0-2930-gaa6d690df_GH0.tar.gz) = 235278878
+SHA256 (The-OpenROAD-Project-OpenSTA-d42313d_GH0.tar.gz) = 08b71ff3cdfc3c6c35f3586d8dffd4dd9a5ba1f12b9fbd4a2c287e1563e8da27
+SIZE (The-OpenROAD-Project-OpenSTA-d42313d_GH0.tar.gz) = 4939189
+SHA256 (The-OpenROAD-Project-abc-d1cd437_GH0.tar.gz) = 81bfb7c716274847740a54a6ab55d11d5cf29f5c7e79fee646956823f6df9bac
+SIZE (The-OpenROAD-Project-abc-d1cd437_GH0.tar.gz) = 5972118
diff --git a/cad/openroad/files/patch-src_CMakeLists.txt b/cad/openroad/files/patch-src_CMakeLists.txt
index c5fe75299e5f..22053c5b6f8a 100644
--- a/cad/openroad/files/patch-src_CMakeLists.txt
+++ b/cad/openroad/files/patch-src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig	2021-07-16 21:09:30 UTC
+--- src/CMakeLists.txt.orig	2022-02-09 14:58:23 UTC
 +++ src/CMakeLists.txt
-@@ -64,7 +64,7 @@ if (BUILD_TCLX AND TCLX_H)
+@@ -128,7 +128,7 @@ if (BUILD_TCLX AND TCLX_H)
    message(STATUS "TclX header: ${TCLX_H}")
  endif()
  
diff --git a/cad/openroad/files/patch-src_OpenDB_CMakeLists.txt b/cad/openroad/files/patch-src_OpenDB_CMakeLists.txt
deleted file mode 100644
index 10c80c7daa77..000000000000
--- a/cad/openroad/files/patch-src_OpenDB_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/OpenDB/CMakeLists.txt.orig	2021-03-11 04:01:41 UTC
-+++ src/OpenDB/CMakeLists.txt
-@@ -29,7 +29,9 @@ add_subdirectory(src/zutil)
- add_subdirectory(src/zlib)
- add_subdirectory(src/tm)
- add_subdirectory(src/cdl)
--add_subdirectory(test/cpp)
-+if (FREEBSD_BUILD_TESTS)
-+  add_subdirectory(test/cpp)
-+endif()
- ############################################################################
- ################################# SWIG #####################################
- ############################################################################
diff --git a/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt b/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt
deleted file mode 100644
index 4ba87720d6ff..000000000000
--- a/cad/openroad/files/patch-src_OpenDB_src_db_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenDB/src/db/CMakeLists.txt.orig	2021-07-16 21:09:30 UTC
-+++ src/OpenDB/src/db/CMakeLists.txt
-@@ -141,7 +141,7 @@ target_link_libraries(opendb
-         zlib 
-         zutil
-         utl
--        tcl
-+        tcl${FREEBSD_TCL_VER}
- )
- 
- messages(
diff --git a/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt b/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt
deleted file mode 100644
index feb38bf60ef5..000000000000
--- a/cad/openroad/files/patch-src_OpenDB_src_swig_tcl_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/OpenDB/src/swig/tcl/CMakeLists.txt.orig	2021-07-16 21:09:30 UTC
-+++ src/OpenDB/src/swig/tcl/CMakeLists.txt
-@@ -16,7 +16,7 @@ target_link_libraries(opendbtcl
-     PUBLIC
-         opendb
-         utl
--        tcl
-+        tcl${FREEBSD_TCL_VER}
-         cdl
-         opendb_swig_common
-         Boost::boost
diff --git a/cad/openroad/files/patch-src_odb_include_odb_dbTypes.h b/cad/openroad/files/patch-src_odb_include_odb_dbTypes.h
new file mode 100644
index 000000000000..3f58e39c3c06
--- /dev/null
+++ b/cad/openroad/files/patch-src_odb_include_odb_dbTypes.h
@@ -0,0 +1,11 @@
+--- src/odb/include/odb/dbTypes.h.orig	2022-02-10 04:05:30 UTC
++++ src/odb/include/odb/dbTypes.h
+@@ -34,6 +34,8 @@
+ 
+ #include "odb.h"
+ 
++#include <sys/types.h> // int8_t
++
+ namespace odb {
+ 
+ ///
diff --git a/cad/openroad/files/patch-src_stt_etc_MakeDatVar.tcl b/cad/openroad/files/patch-src_stt_src_flt_etc_MakeDatVar.tcl
index 131f33a91821..bc91cc282611 100644
--- a/cad/openroad/files/patch-src_stt_etc_MakeDatVar.tcl
+++ b/cad/openroad/files/patch-src_stt_src_flt_etc_MakeDatVar.tcl
@@ -1,5 +1,5 @@
---- src/stt/etc/MakeDatVar.tcl.orig	2021-07-23 05:46:52 UTC
-+++ src/stt/etc/MakeDatVar.tcl
+--- src/stt/src/flt/etc/MakeDatVar.tcl.orig	2022-02-10 04:38:37 UTC
++++ src/stt/src/flt/etc/MakeDatVar.tcl
 @@ -32,7 +32,7 @@ close $var_stream
  set b64_file "[file rootname $dat_file].b64"
  set b64_file2 "[file rootname $dat_file].tr"
diff --git a/cad/openroad/files/patch-third-party_abc_src_sat_glucose2_System2.cpp b/cad/openroad/files/patch-third-party_abc_src_sat_glucose2_System2.cpp
new file mode 100644
index 000000000000..5de527acfc38
--- /dev/null
+++ b/cad/openroad/files/patch-third-party_abc_src_sat_glucose2_System2.cpp
@@ -0,0 +1,11 @@
+--- third-party/abc/src/sat/glucose2/System2.cpp.orig	2022-02-10 03:16:53 UTC
++++ third-party/abc/src/sat/glucose2/System2.cpp
+@@ -86,7 +86,7 @@ double Gluco2::memUsed(void) {
+     struct rusage ru;
+     getrusage(RUSAGE_SELF, &ru);
+     return (double)ru.ru_maxrss / 1024; }
+-double memUsedPeak(void) { return memUsed(); }
++double Gluco2::memUsedPeak(void) { return memUsed(); }
+ 
+ ABC_NAMESPACE_IMPL_END
+ 
diff --git a/cad/openroad/files/patch-third-party_abc_src_sat_glucose_System.cpp b/cad/openroad/files/patch-third-party_abc_src_sat_glucose_System.cpp
new file mode 100644
index 000000000000..c36243a95ed6
--- /dev/null
+++ b/cad/openroad/files/patch-third-party_abc_src_sat_glucose_System.cpp
@@ -0,0 +1,11 @@
+--- third-party/abc/src/sat/glucose/System.cpp.orig	2022-02-10 03:16:18 UTC
++++ third-party/abc/src/sat/glucose/System.cpp
+@@ -86,7 +86,7 @@ double Gluco::memUsed(void) {
+     struct rusage ru;
+     getrusage(RUSAGE_SELF, &ru);
+     return (double)ru.ru_maxrss / 1024; }
+-double memUsedPeak(void) { return memUsed(); }
++double Gluco::memUsedPeak(void) { return memUsed(); }
+ 
+ ABC_NAMESPACE_IMPL_END
+