Use the -k option to sort. This allows the build to run on newer unix

systems, but will likely break the build on older ones.  Please address
your complaints to the posix committee members that thought this would
be a good idea. (CVS 3314)

FossilOrigin-Name: 5d7e6bbddb522de2283474eb6d30cc376daf66f0

diff --git a/Makefile.in b/Makefile.in
index 90fc1c2dd25b819e87718eb8ee652fc6ac39bb90..0a66ef6621ed0b8edc724b197c0ea3f66914b8af 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,7 +250,7 @@ Makefile: $(TOP)/Makefile.in
 # of the most recently modified source code file
 #
 last_change:   $(SRC)
-       cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
+       cat $(SRC) | grep '$$Id: ' | sort -k 4 | tail -1 \
           | $(NAWK) '{print $$5,$$6}' >last_change
 
 libsqlite3.la: $(LIBOBJ)
@@ -349,7 +349,7 @@ opcodes.lo: opcodes.c
        $(LTCOMPILE) -c opcodes.c
 
 opcodes.c:     opcodes.h $(TOP)/mkopcodec.awk
-       sort -n -b +2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
+       sort -n -b -k 2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
 
 opcodes.h:     parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
        cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h

diff --git a/main.mk b/main.mk
index 05a53dd0d360ab8bad067680da74df32d23e2b5a..ce89a525daf95475ce06529bebdd816a454bd8ce 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -180,7 +180,7 @@ all:        sqlite3.h libsqlite3.a sqlite3$(EXE)
 # of the most recently modified source code file
 #
 last_change:   $(SRC)
-       cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
+       cat $(SRC) | grep '$$Id: ' | sort -k 4 | tail -1 \
           | $(NAWK) '{print $$5,$$6}' >last_change
 
 libsqlite3.a:  $(LIBOBJ)
@@ -273,7 +273,7 @@ opcodes.o:  opcodes.c
        $(TCCX) -c opcodes.c
 
 opcodes.c:     opcodes.h $(TOP)/mkopcodec.awk
-       sort -n -b +2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
+       sort -n -b -k 2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
 
 opcodes.h:     parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
        cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h

diff --git a/manifest b/manifest
index c2fbba1b0b2d817480ef924fc15ce109c4c8a5f3..f65b4fe0fecff51abbc04a0d9cecdcdd0d301af9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C When\scompiling\sextensions\sin\sthe\sload_extension\stests,\sspecify\sa\spath\nfor\sfinding\sinclude\sfiles.\s(CVS\s3313)
-D 2006-06-27T18:38:52
-F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
+C Use\sthe\s-k\soption\sto\ssort.\s\sThis\sallows\sthe\sbuild\sto\srun\son\snewer\sunix\nsystems,\sbut\swill\slikely\sbreak\sthe\sbuild\son\solder\sones.\s\sPlease\saddress\nyour\scomplaints\sto\sthe\sposix\scommittee\smembers\sthat\sthought\sthis\swould\nbe\sa\sgood\sidea.\s(CVS\s3314)
+D 2006-06-27T18:55:10
+F Makefile.in 8da50d5e90e0d38517effad2ed6ac9da62625ded
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 301ed2b2c08f5cca242ea56e50a9ed0264a3eb76
@@ -19,7 +19,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk 5dbef60b29006c0bc3fd9ce78c846f38750302e2
+F main.mk 43cc6505f373b4d1ab0d8c71aad53e38230965c9
 F mkdll.sh 919df5efde876194e3102c6ebc60657d38949909
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
 F mkopcodeh.awk cde995d269aa06c94adbf6455bea0acedb913fa5
@@ -375,7 +375,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 70a48b250bab99c5d9b4ad17c471663b8628e8d2
-R 79c4a0c26ade3124618190d2b0ac3a29
+P aee4b669944ccf3888daa9d9e54f16261c64f380
+R 84fee334d2d1fcf58ce4a0326b97a22a
 U drh
-Z 4c8a86e91bcfbf402d238b06dc62212e
+Z 1f2e986872dcc5ed763574e172ea3147

diff --git a/manifest.uuid b/manifest.uuid
index de1f5317567646ee36386b6388bde8c8bbae013b..f5a229483e295d1fa9e3bfdf9b766b023217ed28 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aee4b669944ccf3888daa9d9e54f16261c64f380
\ No newline at end of file
+5d7e6bbddb522de2283474eb6d30cc376daf66f0
\ No newline at end of file