From 9f9ad61ee7a50acdeee75554dfafd6cffe26f42d Mon Sep 17 00:00:00 2001 From: Myrtle Shah Date: Thu, 9 Sep 2021 21:03:26 +0100 Subject: [PATCH 1/5] lefdef: Don't move generated tab.hpp files Signed-off-by: gatecat --- lefdef/src/def/def/CMakeLists.txt | 2 +- lefdef/src/lef/lef/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lefdef/src/def/def/CMakeLists.txt b/lefdef/src/def/def/CMakeLists.txt index 227ff104..78d9b300 100644 --- a/lefdef/src/def/def/CMakeLists.txt +++ b/lefdef/src/def/def/CMakeLists.txt @@ -81,7 +81,7 @@ add_custom_command ( OUTPUT def.tab.cpp DEPENDS ${DefParserGrammar} COMMAND ${BISON_EXECUTABLE} -v -p defyy -d ${DefParserGrammar} -o def.tab.cpp - COMMAND mv def.tab.hpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.h + #COMMAND mv def.tab.hpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.h #COMMAND mv def.tab.cpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.cpp COMMENT "Generating DEF parser (bison)" ) diff --git a/lefdef/src/lef/lef/CMakeLists.txt b/lefdef/src/lef/lef/CMakeLists.txt index e347cf03..16e25ad0 100644 --- a/lefdef/src/lef/lef/CMakeLists.txt +++ b/lefdef/src/lef/lef/CMakeLists.txt @@ -61,7 +61,7 @@ add_custom_command ( OUTPUT lef.tab.cpp DEPENDS ${LefParserGrammar} COMMAND ${BISON_EXECUTABLE} -v -p lefyy -d ${LefParserGrammar} -o lef.tab.cpp - COMMAND mv lef.tab.hpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.h + #COMMAND mv lef.tab.hpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.h #COMMAND mv lef.tab.cpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.cpp COMMENT "Generating LEF parser (bison)" ) From 03f0e51dfd4347a1343b57811c2efece2b269d46 Mon Sep 17 00:00:00 2001 From: Myrtle Shah Date: Fri, 15 Oct 2021 12:51:10 +0100 Subject: [PATCH 2/5] hurricane: Remove '.tp_print' field This field has been deprecated in Python 3 and no longer exists at all in Python 3.9, causing a build error. Signed-off-by: Myrtle Shah --- .../src/configuration/hurricane/configuration/PyTypeManager.h | 1 - 1 file changed, 1 deletion(-) diff --git a/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h b/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h index 1de32e90..3cddc1b3 100644 --- a/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h +++ b/hurricane/src/configuration/hurricane/configuration/PyTypeManager.h @@ -302,7 +302,6 @@ extern "C" { , .tp_basicsize = sizeof(PyOneVoid) , .tp_itemsize = 0 , .tp_dealloc = NULL - , .tp_print = NULL , .tp_getattr = NULL , .tp_setattr = NULL , .tp_as_async = NULL From 2d24efdb6cdc1c1b7d37cc71d3a22a9dcd621d2f Mon Sep 17 00:00:00 2001 From: Myrtle Shah Date: Fri, 15 Oct 2021 13:14:35 +0100 Subject: [PATCH 3/5] Bump minimum CMake version The CMake version set was so old that obsolete policies were being enabled and breaking FindPython. 2.8 should still be old enough not to cause problems for any current users. Signed-off-by: Myrtle Shah --- bootstrap/CMakeLists.txt | 2 +- cumulus/CMakeLists.txt | 2 +- oroshi/CMakeLists.txt | 2 +- stratus1/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap/CMakeLists.txt b/bootstrap/CMakeLists.txt index f3f78d75..4a4c9f3a 100644 --- a/bootstrap/CMakeLists.txt +++ b/bootstrap/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(Bootstrap) - cmake_minimum_required(VERSION 2.4.0) + cmake_minimum_required(VERSION 2.8.0) set(ignoreVariables USE_LIBBFD "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") diff --git a/cumulus/CMakeLists.txt b/cumulus/CMakeLists.txt index b73e6fc3..88663684 100644 --- a/cumulus/CMakeLists.txt +++ b/cumulus/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(CUMULUS) - cmake_minimum_required(VERSION 2.4.0) + cmake_minimum_required(VERSION 2.8.0) set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/oroshi/CMakeLists.txt b/oroshi/CMakeLists.txt index 17b16ef5..61b35bf0 100644 --- a/oroshi/CMakeLists.txt +++ b/oroshi/CMakeLists.txt @@ -2,7 +2,7 @@ project(OROSHI) - cmake_minimum_required(VERSION 2.4.0) + cmake_minimum_required(VERSION 2.8.0) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) set(ignoreVariables "${CMAKE_INSTALL_DIR}") diff --git a/stratus1/CMakeLists.txt b/stratus1/CMakeLists.txt index c92922e2..4ff8d5ae 100644 --- a/stratus1/CMakeLists.txt +++ b/stratus1/CMakeLists.txt @@ -8,7 +8,7 @@ set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 2.4.0) + cmake_minimum_required(VERSION 2.8.0) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) From 8d0faee896100f9dd06da94de4efea2084d1da99 Mon Sep 17 00:00:00 2001 From: Myrtle Shah Date: Fri, 15 Oct 2021 13:26:39 +0100 Subject: [PATCH 4/5] cmake: Set policy needed for latest FindPython to work Signed-off-by: Myrtle Shah --- crlcore/CMakeLists.txt | 2 ++ hurricane/CMakeLists.txt | 1 + unicorn/CMakeLists.txt | 1 + unittests/CMakeLists.txt | 1 + 4 files changed, 5 insertions(+) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index 58d2ccfb..a753658a 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -22,6 +22,8 @@ setup_boost(program_options) setup_qt() + cmake_policy(SET CMP0054 NEW) + if (USE_LIBBFD) find_package(Libbfd) endif() diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index 76ae6d43..98296140 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -17,6 +17,7 @@ list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/") set_cmake_policies() + cmake_policy(SET CMP0054 NEW) setup_boost(program_options) setup_qt() diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index 0a6381b8..128d1758 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -15,6 +15,7 @@ setup_project_paths(CORIOLIS) set_cmake_policies() + cmake_policy(SET CMP0054 NEW) setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") setup_boost(program_options) setup_qt() diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 637aab6d..b15768d7 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -16,6 +16,7 @@ print_cmake_module_path() set_cmake_policies() + cmake_policy(SET CMP0054 NEW) check_distribution() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") setup_boost(program_options) From 1dfa6aff67d3a762b696adb24256ac1568aa7218 Mon Sep 17 00:00:00 2001 From: Myrtle Shah Date: Fri, 15 Oct 2021 13:32:22 +0100 Subject: [PATCH 5/5] Add missing "#include"s Signed-off-by: Myrtle Shah --- bora/src/SlicingPlotWidget.cpp | 1 + bora/src/bora/NodeSets.h | 1 + coloquinte/src/coloquinte/optimization_subproblems.hxx | 1 + coloquinte/src/solvers.cxx | 1 + coloquinte/src/topologies.cxx | 1 + crlcore/src/ccore/alliance/vst/VhdlBit.cpp | 1 + crlcore/src/ccore/spice/SpiceBit.cpp | 1 + hurricane/src/hurricane/DBo.cpp | 1 + hurricane/src/hurricane/hurricane/IntervalTree.h | 2 ++ 9 files changed, 10 insertions(+) diff --git a/bora/src/SlicingPlotWidget.cpp b/bora/src/SlicingPlotWidget.cpp index c3418bec..89995b0b 100644 --- a/bora/src/SlicingPlotWidget.cpp +++ b/bora/src/SlicingPlotWidget.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/bora/src/bora/NodeSets.h b/bora/src/bora/NodeSets.h index c0a32025..e57bb952 100644 --- a/bora/src/bora/NodeSets.h +++ b/bora/src/bora/NodeSets.h @@ -17,6 +17,7 @@ #ifndef BORA_NODE_SETS_H #define BORA_NODE_SETS_H +#include #include #include #include "BoxSet.h" diff --git a/coloquinte/src/coloquinte/optimization_subproblems.hxx b/coloquinte/src/coloquinte/optimization_subproblems.hxx index e0849b23..3ccbdfcc 100644 --- a/coloquinte/src/coloquinte/optimization_subproblems.hxx +++ b/coloquinte/src/coloquinte/optimization_subproblems.hxx @@ -9,6 +9,7 @@ #include #include #include +#include namespace coloquinte{ diff --git a/coloquinte/src/solvers.cxx b/coloquinte/src/solvers.cxx index 57f0fbc1..27d75bae 100644 --- a/coloquinte/src/solvers.cxx +++ b/coloquinte/src/solvers.cxx @@ -4,6 +4,7 @@ #include #include #include +#include namespace coloquinte{ namespace gp{ diff --git a/coloquinte/src/topologies.cxx b/coloquinte/src/topologies.cxx index d36cee41..c9b952f0 100644 --- a/coloquinte/src/topologies.cxx +++ b/coloquinte/src/topologies.cxx @@ -9,6 +9,7 @@ #include #include #include +#include namespace coloquinte{ using edge_t = std::pair; diff --git a/crlcore/src/ccore/alliance/vst/VhdlBit.cpp b/crlcore/src/ccore/alliance/vst/VhdlBit.cpp index 9131d351..09b9e3ea 100644 --- a/crlcore/src/ccore/alliance/vst/VhdlBit.cpp +++ b/crlcore/src/ccore/alliance/vst/VhdlBit.cpp @@ -17,6 +17,7 @@ #include "crlcore/VhdlBit.h" #include "crlcore/VhdlSignal.h" +#include namespace Vhdl { diff --git a/crlcore/src/ccore/spice/SpiceBit.cpp b/crlcore/src/ccore/spice/SpiceBit.cpp index 128198dd..1529251a 100644 --- a/crlcore/src/ccore/spice/SpiceBit.cpp +++ b/crlcore/src/ccore/spice/SpiceBit.cpp @@ -16,6 +16,7 @@ #include "crlcore/SpiceBit.h" +#include namespace Spice { diff --git a/hurricane/src/hurricane/DBo.cpp b/hurricane/src/hurricane/DBo.cpp index 3f9d15b0..adf2aabb 100644 --- a/hurricane/src/hurricane/DBo.cpp +++ b/hurricane/src/hurricane/DBo.cpp @@ -38,6 +38,7 @@ #include "hurricane/Error.h" #include "hurricane/Warning.h" +#include namespace Hurricane { diff --git a/hurricane/src/hurricane/hurricane/IntervalTree.h b/hurricane/src/hurricane/hurricane/IntervalTree.h index b026cbf0..7d4673b2 100644 --- a/hurricane/src/hurricane/hurricane/IntervalTree.h +++ b/hurricane/src/hurricane/hurricane/IntervalTree.h @@ -40,6 +40,8 @@ #include "hurricane/Interval.h" #include "hurricane/RbTree.h" +#include + namespace Hurricane {