Update the Makefile for LSM1 so that the LSMOPTS can be set prior to

including the Makefile, in order to add platform arguments such as -fPIC.

FossilOrigin-Name: fe319bcd7f85e9997babdb024ab350514524f5901903600fa9780bdcd1805098

diff --git a/ext/lsm1/Makefile b/ext/lsm1/Makefile
index 527faa0d1bb77916815930d31323a566b79aef27..064098963836f650711a7d5aea641ecf5c7e2c93 100644 (file)
--- a/ext/lsm1/Makefile
+++ b/ext/lsm1/Makefile
@@ -42,7 +42,7 @@ LSMTESTSRC = $(LSMDIR)/lsm-test/lsmtest1.c $(LSMDIR)/lsm-test/lsmtest2.c     \
 
 # all: lsm.so
 
-LSMOPTS = -DLSM_MUTEX_PTHREADS=1 -I$(LSMDIR)
+LSMOPTS += -DLSM_MUTEX_PTHREADS=1 -I$(LSMDIR)
 
 lsm.so:        $(LSMOBJ)
        $(TCCX) -shared -o lsm.so $(LSMOBJ)
@@ -52,5 +52,4 @@ lsm.so:       $(LSMOBJ)
        
 lsmtest$(EXE): $(LSMOBJ) $(LSMTESTSRC) $(LSMTESTHDR) sqlite3.o
        # $(TCPPX) -c $(TOP)/lsm-test/lsmtest_tdb2.cc
-       $(TCCX) $(LSMOPTS) $(LSMTESTSRC) $(LSMOBJ) sqlite3.o -o lsmtest$(EXE) $(THREADLIB) 
-
+       $(TCCX) $(LSMOPTS) $(LSMTESTSRC) $(LSMOBJ) sqlite3.o -o lsmtest$(EXE) $(THREADLIB)

diff --git a/manifest b/manifest
index 1c46c70e8805e57b6b72c74b17de03c27036c7c5..58a540a9f4c23c101f54e4473edc8a4bb9708f9a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\sheader\scomment\sto\sthe\sremember\sextension.\sNo\scode\schanges.
-D 2017-07-14T15:18:51.192
+C Update\sthe\sMakefile\sfor\sLSM1\sso\sthat\sthe\sLSMOPTS\scan\sbe\sset\sprior\sto\nincluding\sthe\sMakefile,\sin\sorder\sto\sadd\splatform\sarguments\ssuch\sas\s-fPIC.
+D 2017-07-14T15:32:11.515
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -209,7 +209,7 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c 84900472a088a3a172c6c079f58a1d3a1952c332
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
-F ext/lsm1/Makefile a2ea4975162be8932b5efa727080f4982715d34c32035d9eb7a015ae78404981
+F ext/lsm1/Makefile e7ac5d45485131724056d9adb0edc15c392383e60adab796d5e9f3fff0b6407d
 F ext/lsm1/Makefile.msc f9b5f1f9f534231bf315d96364315928f9f06eae1a96435197c98c1f834e23b4
 F ext/lsm1/lsm-test/README 87ea529d2abe615e856d4714bfe8bb185e6c2771b8612aa6298588b7b43e6f86
 F ext/lsm1/lsm-test/lsmtest.h 5847594d4b43ec3412e1fd97104f7eb5fd770be55e691e6cb2e80929f86bebe3
@@ -1633,7 +1633,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 1bc4e93407b7894b0271fbde3720930dcaadda6070e871d9719c4e8dc65b915f
-R 386312fb6e87bd39614009fab41a39f3
+P 604b9664f4dd6e8d188b5c57407edbbe0639345f8d30bf2d19016f8324934840
+R e62594582e589ce478f942cf88cfaba6
 U drh
-Z d6c5988aae6e1cfc836d95d9d82fa12d
+Z 47dc81c8788f0065d77dd19d42980d1e

diff --git a/manifest.uuid b/manifest.uuid
index 23d300352d3f83f23c7f85b6dd9d090a7e22756d..d52a5562a1254a165651918f10276b01ebe8bd77 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-604b9664f4dd6e8d188b5c57407edbbe0639345f8d30bf2d19016f8324934840
\ No newline at end of file
+fe319bcd7f85e9997babdb024ab350514524f5901903600fa9780bdcd1805098
\ No newline at end of file