From 78978dfc45359962723429a4d4b465697437dff0 Mon Sep 17 00:00:00 2001
From: jahway603 <jahway603@protonmail.com>
Date: Thu, 27 Apr 2023 16:27:25 -0400
Subject: [PATCH] Reverting to commit dd9be59e4 or current origin/dev branch

---
 AUTHORS                        | 2 +-
 build.sh                       | 6 +++---
 depends/packages/googletest.mk | 1 -
 depends/packages/libcurl.mk    | 1 -
 depends/packages/libevent.mk   | 1 -
 depends/packages/rust.mk       | 4 ----
 src/cc/makecustom              | 2 +-
 7 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 54de6e03c..20bd581e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,7 +2,7 @@
 
 Duke Leto https://git.hush.is/duke https://github.com/leto
 Miodrag https://github.com/miodragpop
-jahway603 https://git.hush.is/jahway603 https://codeberg.org/jahway603 https://github.com/jahway603
+jahway603 https://git.hush.is/jahway603 https://github.com/jahway603
 
 # The SuperNET Developers
 
diff --git a/build.sh b/build.sh
index 608fbe1a3..7bdf5f93d 100755
--- a/build.sh
+++ b/build.sh
@@ -7,13 +7,13 @@ set -eu -o pipefail
 
 # run correct build script for detected OS
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    MAKE=make ./util/build.sh --disable-tests $@
+    ./util/build.sh --disable-tests $@
 elif [[ "$OSTYPE" == "darwin"* ]]; then
     ./util/build-mac.sh --disable-tests $@
 elif [[ "$OSTYPE" == "msys"* ]]; then
     ./util/build-win.sh --disable-tests $@
-elif [[ "$OSTYPE" == "freebsd"* ]]; then
-    MAKE=gmake ./util/build.sh --disable-tests $@
+#elif [[ "$OSTYPE" == "freebsd"* ]]; then
+    # placeholder
 else
     echo "Unable to detect your OS. What are you using?"
 fi
diff --git a/depends/packages/googletest.mk b/depends/packages/googletest.mk
index 0335d6c1b..00ee3f23b 100644
--- a/depends/packages/googletest.mk
+++ b/depends/packages/googletest.mk
@@ -8,7 +8,6 @@ $(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba514
 define $(package)_set_vars
 $(package)_cxxflags+=-std=c++11
 $(package)_cxxflags_linux=-fPIC
-$(package)_cxxflags_freebsd=-fPIC
 endef
 
 ifeq ($(build_os),darwin)
diff --git a/depends/packages/libcurl.mk b/depends/packages/libcurl.mk
index 8f0116680..1ece9ce64 100644
--- a/depends/packages/libcurl.mk
+++ b/depends/packages/libcurl.mk
@@ -5,7 +5,6 @@ $(package)_download_path=https://curl.haxx.se/download
 $(package)_file_name=curl-$($(package)_version).tar.gz
 $(package)_sha256_hash=b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77
 $(package)_config_opts_linux=--disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=$(host)
-$(package)_config_opts_freebsd=--disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=$(host)
 $(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix) --host=x86_64-w64-mingw32
 $(package)_config_opts_darwin=--disable-shared --enable-static --with-wolfssl --without-ssl --prefix=$(host_prefix)
 $(package)_cflags_darwin=-mmacosx-version-min=10.9
diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 4d88b3828..b3881738a 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -16,7 +16,6 @@ define $(package)_set_vars
   $(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress
   $(package)_config_opts_release=--disable-debug-mode
   $(package)_config_opts_linux=--with-pic
-  $(package)_config_opts_freebsd=--with-pic
 endef
 
 define $(package)_config_cmds
diff --git a/depends/packages/rust.mk b/depends/packages/rust.mk
index 3102aef33..6fbdda037 100644
--- a/depends/packages/rust.mk
+++ b/depends/packages/rust.mk
@@ -7,10 +7,6 @@ $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.g
 $(package)_sha256_hash_darwin=f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304
 $(package)_file_name_mingw32=rust-$($(package)_version)-x86_64-pc-windows-gnu.tar.gz
 $(package)_sha256_hash_mingw32=358e1435347c67dbf33aa9cad6fe501a833d6633ed5d5aa1863d5dffa0349be9
-$(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz
-$(package)_sha256_hash_freebsd=20d062493d01f1816014fe9dbe883bda06f1828a6ddbfb7ee5e4f1df20eb1c3a
-$(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_aarch64_linux=60def40961728212da4b3a9767d5a2ddb748400e150a5f8a6d5aa0e1b8ba1cee
 
 # Mapping from GCC canonical hosts to Rust targets
 # If a mapping is not present, we assume they are identical, unless $host_os is
diff --git a/src/cc/makecustom b/src/cc/makecustom
index 8fca17cba..3516b4023 100755
--- a/src/cc/makecustom
+++ b/src/cc/makecustom
@@ -1,5 +1,5 @@
 #!/bin/sh
-if HOST="$HOST" $MAKE -B -f Makefile_custom "$@"; then
+if HOST="$HOST" make -B -f Makefile_custom "$@"; then
   echo CUSTOMCC BUILD SUCCESSFUL
 else
   echo CUSTOMCC BUILD FAILED