Skip to content

Commit ea30bce

Browse files
author
Christopher J. Brody
committed
Revert "customization: overridable SHA_SUM"
This reverts commit d19fd9b. rationale: They are now using SHA-3 for SQLite amalgamation; now only using SHA-1 for extension functions which are currently not supported in this fork.
1 parent d19fd9b commit ea30bce

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ EXTENSION_FUNCTIONS_URL = https://www.sqlite.org/contrib/download/extension-func
1616
EXTENSION_FUNCTIONS_SHA1 = c68fa706d6d9ff98608044c00212473f9c14892f
1717

1818
EMCC=emcc
19-
SHA_SUM=sha1sum # TODO submit to upstream sql-js version
2019

2120
CFLAGS = \
2221
-O2 \
@@ -179,15 +178,15 @@ sqlite-src: sqlite-src/$(SQLITE_AMALGAMATION) sqlite-src/$(EXTENSION_FUNCTIONS)
179178
sqlite-src/$(SQLITE_AMALGAMATION): cache/$(SQLITE_AMALGAMATION).zip
180179
mkdir -p sqlite-src
181180
echo '$(SQLITE_AMALGAMATION_ZIP_SHA1) ./cache/$(SQLITE_AMALGAMATION).zip' > cache/check.txt
182-
$(SHA_SUM) -c cache/check.txt
181+
sha1sum -c cache/check.txt
183182
rm -rf $@
184183
unzip -u 'cache/$(SQLITE_AMALGAMATION).zip' -d sqlite-src/
185184
touch $@
186185

187186
sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNCTIONS)
188187
mkdir -p sqlite-src
189188
echo '$(EXTENSION_FUNCTIONS_SHA1) ./cache/$(EXTENSION_FUNCTIONS)' > cache/check.txt
190-
$(SHA_SUM) -c cache/check.txt
189+
sha1sum -c cache/check.txt
191190
cp 'cache/$(EXTENSION_FUNCTIONS)' $@
192191

193192

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Sql.js predates WebAssembly, and thus started as an [asm.js](https://en.wikipedi
2222
- remove extension-functions from build
2323
- enable FTS4
2424
- enable R-Tree
25-
- overridable `SHA_SUM` definition in Makefile
2625

2726
## Documentation
2827
A [full documentation](https://sql-js.github.io/sql.js/documentation/class/Database.html) generated from comments inside the source code, is available.

0 commit comments

Comments
 (0)