From a3c26fc9c1e4f9e98ee830bf9d3bc996e94f23f9 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sun, 13 Jun 2021 20:11:58 +0200
Subject: [PATCH] Remove "libwmain" workaround.

---
 build.sh                    |  24 ++++++++----------------
 patch/libwmain-1.0.1.tar.gz | Bin 402 -> 0 bytes
 2 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 patch/libwmain-1.0.1.tar.gz

diff --git a/build.sh b/build.sh
index fc03719..9d8daab 100644
--- a/build.sh
+++ b/build.sh
@@ -7,6 +7,9 @@
 
 set -e
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Set up compiler
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 case "$(cc -dumpmachine)" in
   i686-*)
     readonly MY_CPU=x86
@@ -24,9 +27,11 @@ case "$(cc -dumpmachine)" in
     ;;
 esac
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Initialize paths
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 readonly BASE_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 readonly LIBS_DIR="${BASE_DIR}/.libs/${MY_CPU}"
-
 find "${BASE_DIR}" -maxdepth 1 -type d -name "*-${MY_CPU}" -exec rm -rf "{}" \;
 rm -rf "${LIBS_DIR}" && mkdir -p "${LIBS_DIR}/include" "${LIBS_DIR}/lib"
 
@@ -187,19 +192,6 @@ cp -v src/.libs/libgsasl.a "${LIBS_DIR}/lib"
 cp -v src/gsasl.h src/gsasl-*.h "${LIBS_DIR}/include"
 popd
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# libwmain
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-printf "\n==================== libwmain ====================\n\n"
-readonly LWMN_DIR="${BASE_DIR}/libwmain-${MY_CPU}"
-pkg_lwmn="$(find "${BASE_DIR}/patch" -maxdepth 1 -name 'libwmain-*.tar.gz' | sort -rn | head -n1)"
-rm -rf "${LWMN_DIR}" && mkdir "${LWMN_DIR}"
-tar -xvf "${pkg_lwmn}" --strip-components=1 -C "${LWMN_DIR}"
-pushd "${LWMN_DIR}"
-make MARCH=${MY_MARCH} MTUNE=${MY_MTUNE}
-cp -v libwmain.a "${LIBS_DIR}/lib"
-popd
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # cURL
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -213,8 +205,8 @@ patch -p1 -b < "${BASE_DIR}/patch/curl_threads.diff"
 patch -p1 -b < "${BASE_DIR}/patch/curl_tool_doswin.diff"
 patch -p1 -b < "${BASE_DIR}/patch/curl_tool_parsecfg.diff"
 patch -p1 -b < "${BASE_DIR}/patch/curl_url.diff"
-CFLAGS="-municode -mconsole -march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" CPPFLAGS="-DNGHTTP2_STATICLIB" LDFLAGS="-static -no-pthread -L${LIBS_DIR}/lib" LIBS="-latomic -liconv -lcrypt32 -lwmain" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-libssh2="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-gsasl="${LIBS_DIR}" --without-ca-bundle
-make curl_LDFLAGS=-all-static
+CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" CPPFLAGS="-DNGHTTP2_STATICLIB -DUNICODE -D_UNICODE" LDFLAGS="-static -no-pthread -L${LIBS_DIR}/lib" LIBS="-latomic -liconv -lcrypt32" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-libssh2="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-gsasl="${LIBS_DIR}" --without-ca-bundle
+make curl_LDFLAGS="-all-static -municode -mconsole"
 strip -s src/curl.exe
 popd
 
diff --git a/patch/libwmain-1.0.1.tar.gz b/patch/libwmain-1.0.1.tar.gz
deleted file mode 100644
index 8ef45b6df59509142dd7fc4f3ff90b1ce800bd8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmV;D0d4*tiwFpV6UJZy0BmVucWq&5ZY?n`FfK7JbYXG;?Um1K!Y~xab2Wd(Lp<1G
zHK}Pk6dBSDHkjLR8w|ulSK|!R3T^!X;{U!Ruv%p7q+XWKCGU~%%R7AYlDYWUEFzIO
zv`Lz@h0XyXj08a-SIzONW6Fq68Kul;h*08sE&>l-fK`@9DIx^@PmcWmNt^L0{iozl
z|6Px1{|Re*fk&j?bzO$wS5J)pC#7Y>%k#~<^B`iLWZb!*@FW*g!P5?eAyL-?>=wp+
zoAWdQk>sH6M_mO``WZJMo<%9xGG33yRu^Nnv(cLMQcNt^;YuONMq}u~4ysX;Z+W!=
zT4P%T_FY^_dA^c8bS;&8s?4@6RVNSLV`Pw=b^Zs@7oUnbN9dCC@3Z3l_u5iNX+S+Q
z|CeCUABJ~u-2>6S^6}vH?eSJ;NzUgO7vDkDfg)bwO0C`>T9C#W928~2AuQF!sxAyI
wa28P-&w91GZm#ltm2jEs_A-CUz*&~g11ByWW8MLS!C*K6-`G6M7yu3c09bCpr~m)}