libutf8proc2, cleanup (#8181)

dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe

@@ -7,14 +7,14 @@ COPYRIGHT="2006-2020 Public Software Group
 	2014-2020 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \
 	and other contributors listed in the git history"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/JuliaStrings/utf8proc/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="d4e8dfc898cfd062493cb7f42d95d70ccdd3a4cd4d90bec0c71b47cca688f1be"
 SOURCE_FILENAME="utf8proc-$portVersion.tar.gz"
 SOURCE_DIR="utf8proc-$portVersion"
 PATCHES="libutf8proc2-2.4.0.patchset"
 
-ARCHITECTURES="all ?x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion="2.3.2"
@@ -53,16 +53,15 @@ defineDebugInfoPackage libutf8proc2$secondaryArchSuffix \
 
 BUILD()
 {
-	mkdir -p build_haiku && cd build_haiku
-	cmake .. \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_SHARED_LIBS=ON \
 		$cmakeDirArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build_haiku
-	make install
+	make -C build install
 	prepareInstalledDevelLib libutf8proc
 
 	mkdir -p $developLibDir/pkgconfig