Update script to use mbedtls 2.x for Windows.

bibledit/cloud#944
bibledit · Jul 16, 2024 · 8d78b32 · 8d78b32
1 parent 6c402e8
commit 8d78b32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/1refresh.sh b/1refresh.sh
@@ -90,10 +90,19 @@ sed -i.bak '/HAVE_UTF8PROC/d' config.h
 if [ $? != 0 ]; then exit; fi
 
 
+# Since Windows did have a few build problem on mbedTLS 3.x,
+# use mbedTLS 2.x just now.
+rm -rf mbedtls
+if [ $? != 0 ]; then exit; fi
+mv mbedtls2windows mbedtls
+if [ $? != 0 ]; then exit; fi
+
 # Disable threading in mbedTLS on Windows.
-sed -i.bak '/#define MBEDTLS_THREADING_C/d' mbedtls/mbedtls_config.h
+# sed -i.bak '/#define MBEDTLS_THREADING_C/d' mbedtls/mbedtls_config.h
+sed -i.bak '/#define MBEDTLS_THREADING_C/d' mbedtls/config.h
 if [ $? != 0 ]; then exit; fi
-sed -i.bak '/#define MBEDTLS_THREADING_PTHREAD/d' mbedtls/mbedtls_config.h
+# sed -i.bak '/#define MBEDTLS_THREADING_PTHREAD/d' mbedtls/mbedtls_config.h
+sed -i.bak '/#define MBEDTLS_THREADING_PTHREAD/d' mbedtls/config.h
 if [ $? != 0 ]; then exit; fi
 
 

diff --git a/server/pkgdata/files.txt b/server/pkgdata/files.txt
@@ -184,6 +184,7 @@
 /config
 /config/config.txt
 /config/googletranslate.txt
+/config.h.bak
 /config/ldap.txt
 /config/local.authorities.crt
 /config/local.cert.pem
@@ -549,8 +550,8 @@
 /mapping/Vulgate.txt
 /mbedtls
 /mbedtls/0readme.txt
-/mbedtls_2.x
-/mbedtls_2.x/0readme.txt
+/mbedtls2windows
+/mbedtls2windows/0readme.txt
 /menu
 /microtar
 /microtar/LICENSE