From: stephan <stephan@noemail.net>
Date: Sat, 10 Dec 2022 07:02:46 +0000 (+0000)
Subject: Imply configure flag --disable-shared when --with-wasi-sdk is active because libtool... 
X-Git-Tag: version-3.41.0~35^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bcb5ce472d7b1d7fa47eed9cb6bebec7390fc6a;p=thirdparty%2Fsqlite.git

Imply configure flag --disable-shared when --with-wasi-sdk is active because libtool is running gcc for linking the shared lib, which cannot work in a wasi build.

FossilOrigin-Name: 9253ba43c0c7657ecf4c3d32df4084577e7188e6151b883a5fa92a43aa4c3e30
---

diff --git a/configure b/configure
index 5cd4a2bd14..0614411113 100755
--- a/configure
+++ b/configure
@@ -10907,8 +10907,8 @@ else $as_nop
     if ! test -d "${with_wasi_sdk}" ; then
       as_fn_error $? "${with_wasi_sdk} directory doesn't exist" "$LINENO" 5
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app" >&5
-printf "%s\n" "${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&5
+printf "%s\n" "${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&6; }
     use_wasi_sdk=yes
   else
     use_wasi_sdk=no
@@ -10935,6 +10935,9 @@ else
   enable_threadsafe=no
   use_tcl=no
   enable_tcl=no
+  # libtool is apparently hard-coded to use gcc for linking DLLs, so
+  # we disable the DLL build...
+  enable_shared=no
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 9cd68dd63c..5b4e573f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,7 @@ AC_CACHE_VAL(ac_cv_c_wasi_sdk,[
     if ! test -d "${with_wasi_sdk}" ; then
       AC_MSG_ERROR([${with_wasi_sdk} directory doesn't exist])
     fi
-    AC_MSG_RESULT([${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app])
+    AC_MSG_RESULT([${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL])
     use_wasi_sdk=yes
   else
     use_wasi_sdk=no
@@ -198,6 +198,9 @@ else
   enable_threadsafe=no
   use_tcl=no
   enable_tcl=no
+  # libtool is apparently hard-coded to use gcc for linking DLLs, so
+  # we disable the DLL build...
+  enable_shared=no
 fi
 AC_SUBST(HAVE_WASI_SDK)
 
diff --git a/manifest b/manifest
index 73290a5f26..166680d89f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s--with-wasi-sdk=DIR\sflag\sto\sconfigure.ac.\sThis\smode\scompiles\sbut\sfails\sto\slink\sthe\sDLL\sbecause\slibtool\sis\sapparently\shard-coded\sto\sgcc\sfor\sthe\sDLL.
-D 2022-12-10T06:44:48.363
+C Imply\sconfigure\sflag\s--disable-shared\swhen\s--with-wasi-sdk\sis\sactive\sbecause\slibtool\sis\srunning\sgcc\sfor\slinking\sthe\sshared\slib,\swhich\scannot\swork\sin\sa\swasi\sbuild.
+D 2022-12-10T07:02:46.438
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -33,8 +33,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure a4d3f20148c5cefd1d569a3c83368909a6250f107687c69e41161f418cf0632b x
-F configure.ac b7785dcc6e5c15c45ca1ffc7dc72db61f67cbdce7b7564d097a1cb79d4cefd53
+F configure bf4eb4211407d4583eec9d66c44712b781838fe64dc44ce361680522bf08555c x
+F configure.ac e184f2215aa933c691a41140d286baf28f0c9be24e1d53a97a40851ca26724b2
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
@@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2be2d5d428acd538e44d7b9345b64470131bef40f67ba3190f5cd42f9949f355
-R 764c0bd85411c14594ad3a6f3ef07d68
+P 39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6
+R 8e096ab9ce7a7de4c50eadef054f9ac5
 U stephan
-Z 6513e2f83a7c258ce48894809c0f7313
+Z c27f23eb0fdf959a8de40976e5f5fb98
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bfa81c9f46..081767ab2e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6
\ No newline at end of file
+9253ba43c0c7657ecf4c3d32df4084577e7188e6151b883a5fa92a43aa4c3e30
\ No newline at end of file