git: b5ab8514ee9c - main - math/dgl: Fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 06 Dec 2023 18:13:27 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b5ab8514ee9cd88c944d92d6a45b5d4caab3af2a
commit b5ab8514ee9cd88c944d92d6a45b5d4caab3af2a
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-12-06 18:12:03 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-12-06 18:13:24 +0000
math/dgl: Fix build
Some headers or paths of the project require C++17, but the top-level
CMakeLists.txt was setting C++14.
---
math/dgl/Makefile | 2 +-
math/dgl/files/patch-CMakeLists.txt | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/math/dgl/Makefile b/math/dgl/Makefile
index efd469cc7c44..cf4718993603 100644
--- a/math/dgl/Makefile
+++ b/math/dgl/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS= ${BACKEND_DEPENDS} \
bash:shells/bash \
gmake:devel/gmake
-USES= cmake:testing compiler:c++14-lang localbase:ldflags python:build shebangfix
+USES= cmake:testing compiler:c++17-lang localbase:ldflags python:build shebangfix
USE_LDCONFIG= yes
USE_GITHUB= yes
diff --git a/math/dgl/files/patch-CMakeLists.txt b/math/dgl/files/patch-CMakeLists.txt
index d973f21dd773..534b82fbd7f0 100644
--- a/math/dgl/files/patch-CMakeLists.txt
+++ b/math/dgl/files/patch-CMakeLists.txt
@@ -1,6 +1,15 @@
---- CMakeLists.txt.orig 2023-05-09 05:00:36 UTC
+--- CMakeLists.txt.orig 2023-06-23 05:00:04 UTC
+++ CMakeLists.txt
-@@ -197,7 +197,7 @@ if(NOT MSVC)
+@@ -87,7 +87,7 @@ else(MSVC)
+ # tensorpipe's dependencies require C++14
+ check_cxx_compiler_flag("-std=c++14" SUPPORT_CXX14)
+ set(CMAKE_C_FLAGS "-O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
+- set(CMAKE_CXX_FLAGS "-O2 -Wall -fPIC -std=c++14 ${CMAKE_CXX_FLAGS}")
++ set(CMAKE_CXX_FLAGS "-O2 -Wall -fPIC -std=c++17 ${CMAKE_CXX_FLAGS}")
+ if(NOT APPLE)
+ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--warn-common ${CMAKE_SHARED_LINKER_FLAGS}")
+ endif(NOT APPLE)
+@@ -200,7 +200,7 @@ if(NOT MSVC)
include_directories(${GKLIB_PATH})
include_directories("third_party/METIS/include/")
add_subdirectory("third_party/METIS/libmetis/")