From: dan <dan@noemail.net>
Date: Sat, 8 Oct 2016 09:21:34 +0000 (+0000)
Subject: Updates to the tool/warnings.sh script to make it easier to use on OpenBSD.
X-Git-Tag: version-3.15.0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e288992e198670b31257316cf7bbff272b315a95;p=thirdparty%2Fsqlite.git

Updates to the tool/warnings.sh script to make it easier to use on OpenBSD.

FossilOrigin-Name: dbe2997f57f8d8f95e4b767bf73b8df3a5e4f783
---

diff --git a/manifest b/manifest
index c703e49f4b..b0bf32cff6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\scompiler\swarnings\sin\sfts5.
-D 2016-10-05T20:14:29.499
+C Updates\sto\sthe\stool/warnings.sh\sscript\sto\smake\sit\seasier\sto\suse\son\sOpenBSD.
+D 2016-10-08T09:21:34.023
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -1502,7 +1502,7 @@ F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
 F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
 F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
-F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
+F tool/warnings.sh d9ded5274b3cb947e98e70d587f71d6263f803b5
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F vsixtest/App.xaml b76d3b48860e7454775c47ea38ffea9c4abe3e85
 F vsixtest/App.xaml.cpp c465147f50871165c60ca16955219f6c5812d6d8
@@ -1525,7 +1525,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2dde3375124198560c8ff15f87aadde2afd722c5
-R 4b9b0be198a5bbe128b1c0892a941d69
+P b066637bb75959267fe6104da323c5112ad78f82
+R 895493ea71b68bd283f6f57b6ab90541
 U dan
-Z 15a8a191138ee57877cbdb39242d3ca2
+Z de8241f62395dc0c51d3359eea561a34
diff --git a/manifest.uuid b/manifest.uuid
index 6550bdd74e..dd94310763 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b066637bb75959267fe6104da323c5112ad78f82
\ No newline at end of file
+dbe2997f57f8d8f95e4b767bf73b8df3a5e4f783
\ No newline at end of file
diff --git a/tool/warnings.sh b/tool/warnings.sh
index cee639dc45..ae40cfb1ae 100644
--- a/tool/warnings.sh
+++ b/tool/warnings.sh
@@ -3,15 +3,26 @@
 # Run this script in a directory with a working makefile to check for 
 # compiler warnings in SQLite.
 #
+
+# Use these for testing on Linux and Mac OSX:
+WARNING_OPTS="-Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long"
+WARNING_ANDROID_OPTS="-Wshadow -Wall -Wextra"
+
+# Use these for testing on OpenBSD:
+# WARNING_OPTS=-Wall
+# WARNING_ANDROID_OPTS=-Wall
+
 rm -f sqlite3.c
 make sqlite3.c
 echo '********** No optimizations.  Includes FTS4/5, RTREE, JSON1 ***'
-gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
+echo '**********    ' Options: $WARNING_OPTS
+gcc -c $WARNING_OPTS -std=c89 \
       -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \
       -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 \
       sqlite3.c
 if test x`uname` = 'xLinux'; then
 echo '********** Android configuration ******************************'
+echo '**********    ' Options: $WARNING_ANDROID_OPTS
 gcc -c \
   -DHAVE_USLEEP=1 \
   -DSQLITE_HAVE_ISNAN \
@@ -31,15 +42,17 @@ gcc -c \
   -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 \
   -DSQLITE_ENABLE_ICU \
   -DUSE_PREAD64 \
-  -Wshadow -Wall -Wextra \
+  $WARNING_ANDROID_OPTS \
   -Os sqlite3.c shell.c
 fi
 echo '********** No optimizations. ENABLE_STAT4. THREADSAFE=0 *******'
-gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
+echo '**********    ' Options: $WARNING_OPTS
+gcc -c $WARNING_OPTS -std=c89 \
       -ansi -DSQLITE_ENABLE_STAT4 -DSQLITE_THREADSAFE=0 \
       sqlite3.c
 echo '********** Optimized -O3.  Includes FTS4/5, RTREE, JSON1 ******'
-gcc -O3 -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
+echo '**********    ' Options: $WARNING_OPTS
+gcc -O3 -c $WARNING_OPTS -std=c89 \
       -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \
       -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 \
       sqlite3.c