From 5dd995b016be9573d7f7958e708fa6b8bb79a68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Thu, 23 Mar 2023 12:08:37 +0100
Subject: [PATCH] tox: clean up

---
 net-libs/tox/tox-0.2.12.recipe | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/net-libs/tox/tox-0.2.12.recipe b/net-libs/tox/tox-0.2.12.recipe
index f6e73b261..8f9e25c44 100644
--- a/net-libs/tox/tox-0.2.12.recipe
+++ b/net-libs/tox/tox-0.2.12.recipe
@@ -7,13 +7,13 @@ group chats, audio group chats, and file transfers."
 HOMEPAGE="https://tox.chat/"
 COPYRIGHT="2013-2017 Tox Project"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/TokTok/c-toxcore/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0"
 SOURCE_DIR="c-toxcore-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 
 if [ "$targetArchitecture" != x86_gcc2 ]; then
 	commandSuffix=$secondaryArchSuffix
@@ -71,20 +71,18 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build && cd build
-	cmake .. $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE="Release" \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DCMAKE_EXE_LINKER_FLAGS:STRING=-lnetwork \
 		-DSOCKET_LIBRARIES=-lnetwork \
 		-DUSE_IPV6=OFF
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	prepareInstalledDevelLib \
 		libtoxcore
@@ -96,6 +94,5 @@ INSTALL()
 
 TEST()
 {
-	cd build
-	make test
+	make -C build test
 }