From 75632ec39627dc91c03a6042ac577717e18c66ce Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 23 Mar 2023 12:59:27 +0100
Subject: [PATCH] rapidjson, cleanup (#8073)

---
 dev-libs/rapidjson/rapidjson-1.1.0.recipe | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/dev-libs/rapidjson/rapidjson-1.1.0.recipe b/dev-libs/rapidjson/rapidjson-1.1.0.recipe
index 83f42ffdd..4d38e39b3 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0.recipe
+++ b/dev-libs/rapidjson/rapidjson-1.1.0.recipe
@@ -23,13 +23,13 @@ UTF-16 in the DOM. It also supports surrogates and \"\u0000\" \
 HOMEPAGE="https://github.com/Tencent/rapidjson"
 COPYRIGHT="2015 THL A29 Limited, a Tencent company, and Milo Yip"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/Tencent/rapidjson/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e"
 SOURCE_FILENAME="rapidjson-$portVersion.tar.gz"
 PATCHES="rapidjson-$portVersion.patchset"
 
-ARCHITECTURES="all ?x86_gcc2 ?x86"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion="$portVersion"
@@ -56,10 +56,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p haiku_build
-	cd haiku_build
-
-	cmake .. \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_SHARED_LIBS=ON \
 		-DRAPIDJSON_BUILD_DOC=ON \
 		-DRAPIDJSON_BUILD_EXAMPLES=OFF \
@@ -69,14 +66,12 @@ BUILD()
 		-DLIB_INSTALL_DIR=$libDir \
 		-DDOC_INSTALL_DIR=$docDir \
 		$cmakeDirArgs
-
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd haiku_build
-	make install
+	make -C build install
 
 	fixPkgconfig
 }