From c2804139797f347cabb5d52fd87c8a076d50ae8f Mon Sep 17 00:00:00 2001
From: tobtoht <thotbot@protonmail.com>
Date: Wed, 14 Jul 2021 14:26:28 +0200
Subject: [PATCH 1/3] Build: Remove INSTALL_VENDORED_LIBUNBOUND

---
 CMakeLists.txt | 1 -
 Makefile       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9c76e6..cbac4bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ set(MONERO_HEAD "d0662146e12d9c0ac9905b4423bb27bd68a4444e")
 set(BUILD_GUI_DEPS ON)
 set(ARCH "x86-64")
 set(BUILD_64 ON)
-set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
 set(USE_SINGLE_BUILDDIR ON)
 
 check_include_file(sys/prctl.h HAVE_SYS_PRCTL_H)
diff --git a/Makefile b/Makefile
index 10a28ae..187f8f9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@ CMAKEFLAGS = \
 	-DTOR_BIN=Off \
 	-DCMAKE_CXX_STANDARD=11 \
 	-DCMAKE_VERBOSE_MAKEFILE=On \
-	-DINSTALL_VENDORED_LIBUNBOUND=Off \
 	-DMANUAL_SUBMODULES=1 \
 	-DSTATIC=On \
 	-DUSE_DEVICE_TREZOR=On \

From 56c57a8c23078fb59fa7b7608a9fa9d9f19fb983 Mon Sep 17 00:00:00 2001
From: tobtoht <thotbot@protonmail.com>
Date: Wed, 14 Jul 2021 14:51:44 +0200
Subject: [PATCH 2/3] CMakeLists: remove THREADS_PREFER_PTHREAD_FLAG

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbac4bd..87224dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ project(feather)
 
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "1")
 set(VERSION_REVISION "0")

From b16bf440f6398aea3a0043dbc56460408019e214 Mon Sep 17 00:00:00 2001
From: tobtoht <thotbot@protonmail.com>
Date: Wed, 14 Jul 2021 15:37:53 +0200
Subject: [PATCH 3/3] Makefile: cleanup

---
 Makefile | 73 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 187f8f9..5a20cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,42 +3,49 @@
 
 CMAKEFLAGS = \
 	-DARCH=x86_64 \
-	-DBUILD_64=On \
-	-DBUILD_TESTS=Off \
-	-DLOCALMONERO=On \
-	-DXMRIG=On \
-	-DCHECK_UPDATES=Off \
-	-DTOR_BIN=Off \
-	-DCMAKE_CXX_STANDARD=11 \
-	-DCMAKE_VERBOSE_MAKEFILE=On \
-	-DMANUAL_SUBMODULES=1 \
-	-DSTATIC=On \
-	-DUSE_DEVICE_TREZOR=On \
-	$(CMAKEFLAGS_EXTRA)
+	-DTOR_BIN=$(or ${TOR_BIN}, Off) \
+	-DTOR_VERSION=$(or ${TOR_VERSION}, Off) \
+	-DCHECK_UPDATES=$(or ${CHECK_UPDATES}, Off) \
+	-DWITH_SCANNER=$(or ${WITH_SCANNER}, Off) \
+	-DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH}, Off)
+
+release:
+	mkdir -p build/release && \
+	cd build/release && \
+	cmake -D CMAKE_BUILD_TYPE=Release $(CMAKEFLAGS) ../.. && \
+	$(MAKE)
 
-release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64"
-release-static: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN}, Off)
-release-static: CMAKEFLAGS += -DTOR_VERSION=$(or ${TOR_VERSION}, Off)
-release-static: CMAKEFLAGS += -DCHECK_UPDATES=$(or ${CHECK_UPDATES}, Off)
-release-static: CMAKEFLAGS += -DWITH_SCANNER=$(or ${WITH_SCANNER}, Off)
-release-static: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
-release-static: CMAKEFLAGS += -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH}, Off)
 release-static:
-	cmake -Bbuild $(CMAKEFLAGS)
-	$(MAKE) -Cbuild
+	mkdir -p build/release && \
+	cd build/release && \
+	cmake \
+		-D BUILD_TAG="linux-x64" \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D STATIC=On \
+		$(CMAKEFLAGS) \
+		../.. && \
+	$(MAKE)
 
 depends:
-	mkdir -p build/$(target)/release
-	cd build/$(target)/release && cmake -D STATIC=ON -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) -DTOR_VERSION=$(or ${TOR_VERSION}, OFF) -DTOR_BIN=$(or ${TOR_BIN},OFF) -DCHECK_UPDATES=$(or ${CHECK_UPDATES}, OFF) -DWITH_SCANNER=$(or ${WITH_SCANNER}, Off) -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
+	mkdir -p build/$(target)/release && \
+	cd build/$(target)/release && \
+	cmake \
+		-D BUILD_TAG=$(tag) \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D STATIC=ON \
+		-D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake \
+		$(CMAKEFLAGS) \
+		../../.. && \
+	$(MAKE)
 
-mac-release: CMAKEFLAGS += -DSTATIC=Off
-mac-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN}, Off)
-mac-release: CMAKEFLAGS += -DTOR_VERSION=$(or ${TOR_VERSION}, Off)
-mac-release: CMAKEFLAGS += -DCHECK_UPDATES=$(or ${CHECK_UPDATES}, Off)
-mac-release: CMAKEFLAGS += -DWITH_SCANNER=$(or ${WITH_SCANNER}, On)
-mac-release: CMAKEFLAGS += -DBUILD_TAG="mac-x64"
-mac-release: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
 mac-release:
-	cmake -Bbuild $(CMAKEFLAGS)
-	$(MAKE) -Cbuild
-	$(MAKE) -Cbuild deploy
+	mkdir -p build && \
+	cd build && \
+	cmake \
+        -D BUILD_TAG="mac-x64" \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D STATIC=Off \
+		$(CMAKEFLAGS) \
+		.. && \
+	$(MAKE) && \
+	$(MAKE) deploy