From: drh Date: Wed, 14 Oct 2015 20:03:00 +0000 (+0000) Subject: Update makefiles to remove all uses of "awk" - to make building SQLite easier X-Git-Tag: version-3.10.0~237 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdefc36792ef0c7f594586ed4522231731f54566;p=thirdparty%2Fsqlite.git Update makefiles to remove all uses of "awk" - to make building SQLite easier on Windows systems. The only requirements now are tclsh, a C compiler, and common file utilities. FossilOrigin-Name: 4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8 --- fdefc36792ef0c7f594586ed4522231731f54566 diff --cc Makefile.msc index 13f4fe4d3b,d980e3c652..8bbd6cf126 --- a/Makefile.msc +++ b/Makefile.msc @@@ -1230,21 -1227,21 +1228,21 @@@ libsqlite3.lib: $(LIBOBJ $(LTLIB) $(LTLIBOPTS) /OUT:$@ $(LIBOBJ) $(TLIBS) libtclsqlite3.lib: tclsqlite.lo libsqlite3.lib - $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS) + $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCLSTUB) $(TLIBS) -sqlite3.exe: $(TOP)\src\shell.c $(JSON1_DEP) $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h - $(LTLINK) $(SHELL_COMPILE_OPTS) $(JSON1_OPT) $(READLINE_FLAGS) $(TOP)\src\shell.c $(JSON1_SRC) \ - /link /pdb:sqlite3sh.pdb $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS) +sqlite3.exe: $(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h + $(LTLINK) $(SHELL_COMPILE_OPTS) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c \ + /link /pdb:sqlite3sh.pdb $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS) sqldiff.exe: $(TOP)\tool\sqldiff.c sqlite3.c sqlite3.h - $(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c sqlite3.c + $(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c sqlite3.c /link $(LDFLAGS) $(LTLINKOPTS) -fuzzershell.exe: $(TOP)\tool\fuzzershell.c sqlite3.c sqlite3.h $(JSON1_DEP) - $(LTLINK) $(NO_WARN) $(JSON1_OPT) \ - $(TOP)\tool\fuzzershell.c $(JSON1_SRC) sqlite3.c +fuzzershell.exe: $(TOP)\tool\fuzzershell.c sqlite3.c sqlite3.h + $(LTLINK) $(NO_WARN) $(FUZZERSHELL_COMPILE_OPTS) \ + $(TOP)\tool\fuzzershell.c sqlite3.c /link $(LDFLAGS) $(LTLINKOPTS) -fuzzcheck.exe: $(TOP)\test\fuzzcheck.c sqlite3.c sqlite3.h $(JSON1_DEP) - $(LTLINK) $(NO_WARN) $(JSON1_OPT) $(TOP)\test\fuzzcheck.c $(JSON1_SRC) sqlite3.c +fuzzcheck.exe: $(TOP)\test\fuzzcheck.c sqlite3.c sqlite3.h + $(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(TOP)\test\fuzzcheck.c sqlite3.c /link $(LDFLAGS) $(LTLINKOPTS) mptester.exe: $(TOP)\mptest\mptest.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h $(LTLINK) $(NO_WARN) $(SHELL_COMPILE_OPTS) $(TOP)\mptest\mptest.c \ diff --cc configure index 67a926ecbb,2660574834..b5ec65f2df --- a/configure +++ b/configure @@@ -3921,13 -3910,13 +3920,13 @@@ if ${lt_cv_nm_interface+:} false; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3924: $ac_compile\"" >&5) - (eval echo "\"\$as_me:3913: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:3923: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3927: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval echo "\"\$as_me:3916: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:3926: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3930: output\"" >&5) - (eval echo "\"\$as_me:3919: output\"" >&5) ++ (eval echo "\"\$as_me:3929: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@@ -5133,7 -5122,7 +5132,7 @@@ ia64-*-hpux* ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5136 "configure"' > conftest.$ac_ext - echo '#line 5125 "configure"' > conftest.$ac_ext ++ echo '#line 5135 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@@ -6658,11 -6647,11 +6657,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6661: $lt_compile\"" >&5) - (eval echo "\"\$as_me:6650: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6660: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6665: \$? = $ac_status" >&5 - echo "$as_me:6654: \$? = $ac_status" >&5 ++ echo "$as_me:6664: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -6997,11 -6986,11 +6996,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7000: $lt_compile\"" >&5) - (eval echo "\"\$as_me:6989: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6999: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7004: \$? = $ac_status" >&5 - echo "$as_me:6993: \$? = $ac_status" >&5 ++ echo "$as_me:7003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -7102,11 -7091,11 +7101,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7105: $lt_compile\"" >&5) - (eval echo "\"\$as_me:7094: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7104: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7109: \$? = $ac_status" >&5 - echo "$as_me:7098: \$? = $ac_status" >&5 ++ echo "$as_me:7108: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -7157,11 -7146,11 +7156,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7160: $lt_compile\"" >&5) - (eval echo "\"\$as_me:7149: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7159: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7164: \$? = $ac_status" >&5 - echo "$as_me:7153: \$? = $ac_status" >&5 ++ echo "$as_me:7163: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -9537,7 -9526,7 +9536,7 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF - #line 9540 "configure" -#line 9529 "configure" ++#line 9539 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@@ -9633,7 -9622,7 +9632,7 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF - #line 9636 "configure" -#line 9625 "configure" ++#line 9635 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --cc manifest index d281516416,439f387bb5..df7ef17455 --- a/manifest +++ b/manifest @@@ -1,14 -1,11 +1,11 @@@ - C Enable\scross-compiling\sthe\svarious\stool\sEXEs\swith\sMSVC. - D 2015-10-14T20:01:12.045 - F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663 - F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc c3b8393498780d2207278c7beae0042d9f881007 - F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 -C Remove\sAWK\srequirement\sfrom\sthe\sMSVC\sbatch\sbuild\stool. -D 2015-10-12T03:56:21.327 -F Makefile.in 2a247c733c2dd6fab703df04dd009b26413956f5 ++C Update\smakefiles\sto\sremove\sall\suses\sof\s"awk"\s-\sto\smake\sbuilding\sSQLite\seasier\non\sWindows\ssystems.\s\sThe\sonly\srequirements\snow\sare\stclsh,\sa\sC\scompiler,\sand\ncommon\sfile\sutilities. ++D 2015-10-14T20:03:00.297 ++F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee + F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 -F Makefile.msc f846966b1c38bdc12a384bd48bfbdb257fb5b558 ++F Makefile.msc 9660c072f65b2742595687b30f6d9ae55001ae06 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 -F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975 +F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 - F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 @@@ -38,8 -35,8 +35,8 @@@ F autoconf/tea/win/rules.vc c511f222b80 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977 F config.h.in 42b71ad3fe21c9e88fa59e8458ca1a6bc72eb0c0 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55 - F configure 4561c28dbc22bd5c678e3d5dc631cf7ee7e78efb x - F configure.ac 1e87304e51af110950c48a1eea6ffc7a577f600e -F configure 8f9f13f9a371bea36bc5b8818bbd56e4e8ba200d x -F configure.ac 27a3ebbfe43aab82319c68aa0a11377bbfe29246 ++F configure 99485c9c0446d1236a78a53de6f2737f45f0aca5 x ++F configure.ac f36bd4fb8c53eed8374c5a5ef319807c08c23fa9 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710 @@@ -264,9 -260,7 +261,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 645d30a780fb304cf7fa79537b78728e32dd46fc - F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea - F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a -F main.mk fdc70f6d0d018b97f351a8fa12db6b10d9baaffc ++F main.mk 47b879ad92fe896895dcfc1bbec5c119ee2aa690 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 @@@ -1390,7 -1390,7 +1391,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 01d3ee7bbe4feeb82dcedecbe3c9058c807b18f6 - R c40c01c72f42f25a92a8c4a83d0b3093 -P 7c5d583bac89f8db94e7f73df09e1d04f0f24990 -R 47cd1b08f2579a86c3f7eed6daa15a48 --U mistachkin - Z fc9103245e653032cd30d15d9e8811ac -Z 42590804f6e58f764778427b7ddbdea9 ++P 7d77233389c595237d5b3d244b8aeca1524290c0 6d9cdb931cf4e2f0830184cff32e441e4966bd7e ++R b35466bcd9913c829dbd9e3ab76bfe7d ++T +closed 6d9cdb931cf4e2f0830184cff32e441e4966bd7e ++U drh ++Z 46c8c0b0de353ffbb08761cc90f08587 diff --cc manifest.uuid index 76d58ba4fc,03917d0b4d..81258b88be --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 7d77233389c595237d5b3d244b8aeca1524290c0 -6d9cdb931cf4e2f0830184cff32e441e4966bd7e ++4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8