Date: Wed, 16 Aug 2023 18:30:44 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7a79a5e8e697 - main - graphics/s2: Fix c++17 setting Message-ID: <202308161830.37GIUiQE024874@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a79a5e8e697a69ade26021f34b45928f64dc10d commit 7a79a5e8e697a69ade26021f34b45928f64dc10d Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-08-16 18:10:18 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-08-16 18:25:10 +0000 graphics/s2: Fix c++17 setting Before: ... -std=c++17 -DNDEBUG -std=c++11 ... After: ... -DNDEBUG -std=c++17 ... --- graphics/s2/Makefile | 1 - graphics/s2/files/patch-CMakeLists.txt | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile index ab85f9a158da..73ccafaa6088 100644 --- a/graphics/s2/Makefile +++ b/graphics/s2/Makefile @@ -22,7 +22,6 @@ USES= cmake compiler:c++17-lang localbase ssl CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= WITH_PYTHON -USE_CXXSTD= c++17 USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/graphics/s2/files/patch-CMakeLists.txt b/graphics/s2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..914e384ef56c --- /dev/null +++ b/graphics/s2/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-04-01 11:53:29 UTC ++++ CMakeLists.txt +@@ -19,7 +19,7 @@ endif() + # undefined symbol errors since ABSL_HAVE_STD_STRING_VIEW etc will + # end up defined differently. There is probably a better way to achieve + # this than assuming what absl used. +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + # No compiler-specific extensions, i.e. -std=c++11, not -std=gnu++11. + set(CMAKE_CXX_EXTENSIONS OFF)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308161830.37GIUiQE024874>