Skip to content

Commit f44db18

Browse files
committed
Fix Linux Musl 32bit
1 parent f3af1b0 commit f44db18

File tree

3 files changed

+23
-133
lines changed

3 files changed

+23
-133
lines changed

.github/workflows/build-native.yml

Lines changed: 0 additions & 116 deletions
This file was deleted.

Makefile

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,38 +70,44 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
7070
@mkdir -p $(@D)
7171
cp $(TARGET)/$(SQLITE_AMAL_PREFIX)/* $(SQLITE_OUT)/
7272

73+
74+
# perl -p -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
75+
$(SQLITE_SOURCE)/sqlite3ext.h > $(SQLITE_OUT)/sqlite3ext.h
7376
# insert a code for loading extension functions
74-
# perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc = RegisterExtensionFunctions(db); }\nopendb_out:/;" $(SQLITE_SOURCE)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c.tmp
77+
# perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc = RegisterExtensionFunctions(db); }\nopendb_out:/;" \
78+
$(SQLITE_SOURCE)/sqlite3mc_amalgamation.c > $(SQLITE_OUT)/sqlite3mc_amalgamation.c.tmp
7579
# register compile option 'JDBC_EXTENSIONS'
76-
# perl -p -e "s/#if SQLITE_LIKE_DOESNT_MATCH_BLOBS/ \"JDBC_EXTENSIONS\",\n#if SQLITE_LIKE_DOESNT_MATCH_BLOBS/;" $(SQLITE_OUT)/sqlite3.c.tmp > $(SQLITE_OUT)/sqlite3.c
77-
# cat src/main/ext/*.c >> $(SQLITE_OUT)/sqlite3.c
80+
# limits defined here: https://www.sqlite.org/limits.html
81+
# perl -p -e "s/^(static const char \* const sqlite3azCompileOpt.+)$$/\1\n\n\/* This has been automatically added by sqlite-jdbc *\/\n \"JDBC_EXTENSIONS\",/;" \
82+
$(SQLITE_OUT)/sqlite3mc_amalgamation.c.tmp > $(SQLITE_OUT)/sqlite3mc_amalgamation.c
83+
# cat src/main/ext/*.c >> $(SQLITE_OUT)/sqlite3mc_amalgamation.c
7884

7985
$(CC) -v
8086

8187
$(CC) -o $@ -c $(CCFLAGS) \
8288
-DSQLITE_ENABLE_LOAD_EXTENSION=1 \
8389
-DSQLITE_HAVE_ISNAN \
8490
-DHAVE_USLEEP=1 \
85-
-DSQLITE_ENABLE_COLUMN_METADATA \
86-
-DSQLITE_CORE \
87-
-DSQLITE_ENABLE_FTS3 \
88-
-DSQLITE_ENABLE_FTS3_PARENTHESIS \
89-
-DSQLITE_ENABLE_FTS5 \
90-
-DSQLITE_ENABLE_RTREE \
91-
-DSQLITE_ENABLE_JSON1 \
91+
-DSQLITE_ENABLE_COLUMN_METADATA \
92+
-DSQLITE_CORE \
93+
-DSQLITE_ENABLE_FTS3 \
94+
-DSQLITE_ENABLE_FTS3_PARENTHESIS \
95+
-DSQLITE_ENABLE_FTS5 \
96+
-DSQLITE_ENABLE_RTREE \
97+
-DSQLITE_ENABLE_JSON1 \
9298
-DSQLITE_ENABLE_STAT4 \
9399
-DSQLITE_ENABLE_DBSTAT_VTAB \
94100
-DSQLITE_THREADSAFE=1 \
95101
-DSQLITE_DEFAULT_MEMSTATUS=0 \
96102
-DSQLITE_DEFAULT_FILE_PERMISSIONS=0666 \
97103
-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
98104
-DSQLITE_MAX_MMAP_SIZE=1099511627776 \
99-
-DSQLITE_MAX_LENGTH=2147483647 \
100-
-DSQLITE_MAX_COLUMN=32767 \
101-
-DSQLITE_MAX_SQL_LENGTH=1073741824 \
102-
-DSQLITE_MAX_FUNCTION_ARG=127 \
103-
-DSQLITE_MAX_ATTACHED=125 \
104-
-DSQLITE_MAX_PAGE_COUNT=4294967294 \
105+
-DSQLITE_MAX_LENGTH=2147483647 \
106+
-DSQLITE_MAX_COLUMN=32767 \
107+
-DSQLITE_MAX_SQL_LENGTH=1073741824 \
108+
-DSQLITE_MAX_FUNCTION_ARG=127 \
109+
-DSQLITE_MAX_ATTACHED=125 \
110+
-DSQLITE_MAX_PAGE_COUNT=4294967294 \
105111
-DSQLITE_ENABLE_MATH_FUNCTIONS=1 \
106112
-DSQLITE_ENABLE_REGEXP=1 \
107113
-DSQLITE_ENABLE_VSV=1 \

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Linux-Musl-x86_64_SQLITE_FLAGS :=
9595

9696
Linux-Musl-x86_CC := $(CROSS_PREFIX)gcc
9797
Linux-Musl-x86_STRIP := $(CROSS_PREFIX)strip
98-
Linux-Musl-x86_CCFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -Os -fPIC -m64 -fvisibility=hidden -msse4.2 -maes
98+
Linux-Musl-x86_CCFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -Os -fPIC -m32 -fvisibility=hidden -msse4.2 -maes
9999
Linux-Musl-x86_LINKFLAGS := -shared -static-libgcc
100100
Linux-Musl-x86_LIBNAME := libsqlitejdbc.so
101101
Linux-Musl-x86_SQLITE_FLAGS :=

0 commit comments

Comments
 (0)