Skip to content

Commit 6220ebf

Browse files
committed
fix: macOS build - sqlite3 link and missing libtool
- deps/Makefile: Use -dynamiclib -undefined dynamic_lookup for sqlite3 shared lib on Darwin (Linux -shared allows unresolved symbols, macOS does not). Also link OpenSSL for SHA1 symbol resolution. - workflows: Add libtool to brew install (provides glibtoolize needed by curl's autoreconf).
1 parent 085c880 commit 6220ebf

7 files changed

Lines changed: 10 additions & 6 deletions

.github/workflows/CI-build-macos-macos-13-genai.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
brew install automake bzip2 cmake gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
39+
brew install automake bzip2 cmake gpatch gnutls libtool openssl@3 icu4c pkg-config libiconv zlib
4040
4141
- name: Checkout repository
4242
uses: actions/checkout@v4

.github/workflows/CI-build-macos-macos-13-v31.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
brew install automake bzip2 cmake gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
39+
brew install automake bzip2 cmake gpatch gnutls libtool openssl@3 icu4c pkg-config libiconv zlib
4040
4141
- name: Checkout repository
4242
uses: actions/checkout@v4

.github/workflows/CI-build-macos-macos-13.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
brew install automake bzip2 cmake gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
39+
brew install automake bzip2 cmake gpatch gnutls libtool openssl@3 icu4c pkg-config libiconv zlib
4040
4141
- name: Checkout repository
4242
uses: actions/checkout@v4

.github/workflows/CI-build-macos-macos-14-genai.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
brew install automake bzip2 cmake gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
39+
brew install automake bzip2 cmake gpatch gnutls libtool openssl@3 icu4c pkg-config libiconv zlib
4040
4141
- name: Checkout repository
4242
uses: actions/checkout@v4

.github/workflows/CI-build-macos-macos-14-v31.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
brew install automake bzip2 cmake gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
39+
brew install automake bzip2 cmake gpatch gnutls libtool openssl@3 icu4c pkg-config libiconv zlib
4040
4141
- name: Checkout repository
4242
uses: actions/checkout@v4

.github/workflows/CI-build-macos-macos-14.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Install dependencies
3838
run: |
39-
brew install automake bzip2 cmake gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
39+
brew install automake bzip2 cmake gpatch gnutls libtool openssl@3 icu4c pkg-config libiconv zlib
4040
4141
- name: Checkout repository
4242
uses: actions/checkout@v4

deps/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,11 @@ sqlite3/sqlite3/sqlite3.o:
271271
cd sqlite3/sqlite3 && patch -p0 < ../sqlite3_pass_exts.patch
272272
cd sqlite3/sqlite3 && patch -p0 < ../throw.patch
273273
cd sqlite3/sqlite3 && ${CC} ${MYCFLAGS} -fPIC -c -o sqlite3.o sqlite3.c -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_DLL=1 -DSQLITE_ENABLE_MATH_FUNCTIONS
274+
ifeq ($(UNAME_S),Darwin)
275+
cd sqlite3/sqlite3 && ${CC} -dynamiclib -undefined dynamic_lookup -install_name @rpath/libsqlite3.so -o libsqlite3.so sqlite3.o $(LIB_SSL_PATH) $(LIB_CRYPTO_PATH)
276+
else
274277
cd sqlite3/sqlite3 && ${CC} -shared -o libsqlite3.so sqlite3.o
278+
endif
275279

276280
sqlite3/sqlite3/vec.o: sqlite3/sqlite3/sqlite3.o
277281
cd sqlite3/sqlite3 && cp ../sqlite-vec-source/sqlite-vec.c . && cp ../sqlite-vec-source/sqlite-vec.h .

0 commit comments

Comments
 (0)