Skip to content

Commit 730a25e

Browse files
committed
fixed build on mac M1
1 parent bd7ee08 commit 730a25e

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ log*
1111
build
1212
Cargo.lock
1313
testdbs
14-
__pycache__
14+
__pycache__
15+
.DS_Store

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if [ "$MOJO_TEST" != "" ]; then
6161

6262
export MOJOKV_CLI=./target/$BUILD_PROFILE/mojo-cli
6363

64-
python3 test-scripts/testdb.py $MESON_BUILD_DIR/libmojo
64+
python3 test-scripts/testdb.py $MESON_BUILD_DIR/mojo
6565
if [ $? -ne 0 ]; then
6666
echo "Error: mojo test failed with $?"
6767
exit 1

meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ mojofs_lib = compiler.find_library('mojofs',
1111
dirs: [mojokv_lib_path])
1212

1313
mojofs_dep = declare_dependency(dependencies: [mojofs_lib])
14+
sqlite_dep = dependency('sqlite3')
1415

1516
shared_library('mojo',
17+
name_prefix: '',
1618
sources: ['sqlite-ext/mojo.c'],
1719
include_directories: ['sqlite-ext'],
18-
dependencies: [mojofs_dep])
20+
dependencies: [mojofs_dep, sqlite_dep])
1921

sqlite-ext/mojo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int mojo_fullpath_name(
5151
return SQLITE_OK;
5252
}
5353

54-
int sqlite3_extension_init(sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi){
54+
int sqlite3_mojo_init(sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi){
5555
int rc = SQLITE_OK;
5656
SQLITE_EXTENSION_INIT2(pApi);
5757

0 commit comments

Comments
 (0)