<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/533eac346a6675d71fd5103445def703ad0258ea">https://github.com/macports/macports-ports/commit/533eac346a6675d71fd5103445def703ad0258ea</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 533eac346a6 rapidjson-devel: fix build failure
</span>533eac346a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 533eac346a6675d71fd5103445def703ad0258ea
</span>Author: Julien Salort <jsalort@users.noreply.github.com>
AuthorDate: Sun Dec 25 03:39:58 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> rapidjson-devel: fix build failure
</span>---
devel/rapidjson-devel/Portfile | 6 +++-
.../files/patch-CMakeLists-arch.diff | 32 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/Portfile b/devel/rapidjson-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef189715100..de592890da8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ PortGroup cmake 1.1
</span> # see https://github.com/macports/macports-ports/pull/1738
github.setup Tencent rapidjson b32cd9421c5e3cbe183a99b6537ce11441e50656
version 20180424
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name rapidjson-devel
checksums rmd160 a0211ac1dc84270169b59c584894a0f49d0030a8 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +23,8 @@ platforms darwin
</span> # original by {@Lord-Kamina gmail.com:g.litenstein}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts rapidjson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description A fast JSON parser/generator for C++ with both SAX/DOM style API.
long_description RapidJSON is a fast, unicode-friendly, self-contained \
and header-only library without any dependencies for parsing JSON.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +35,8 @@ homepage http://rapidjson.org/
</span> # Disbled Valgrind because it's apparently failing not due to issues with RapidJSON but rather macOS itself.
patchfiles patch-test-CmakeLists.txt.diff \
patch-test-unittest.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-test-unittest-CmakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-test-unittest-CmakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeLists-arch.diff
</span>
depends_build-append bin:doxygen:doxygen
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson-devel/files/patch-CMakeLists-arch.diff b/devel/rapidjson-devel/files/patch-CMakeLists-arch.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8509f659fc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson-devel/files/patch-CMakeLists-arch.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.orig.txt 2022-12-23 08:11:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2022-12-23 08:11:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,14 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,14 +80,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(NOT CMAKE_CROSSCOMPILING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1)
</span></pre><pre style='margin:0'>
</pre>