Skip to content

Commit b5fffee

Browse files
committed
link libsqlite3.so.0 instead of libsqlite3.so
1 parent abf4b4c commit b5fffee

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v2
3030
- name: detect GIT_REVISION
31-
run: echo "::set-env name=GIT_REVISION::$(git describe --tags --long --always)"
31+
run: echo "::set-env name=GIT_REVISION::$(git describe --tags --always)"
3232
- name: build loaders
3333
run: |
3434
sudo apt-get install -y $APT_DEPS

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ set(CMAKE_CXX_STANDARD 11)
3131
set(CMAKE_CXX_STANDARD_REQUIRED ON)
3232
set(CMAKE_CXX_EXTENSIONS OFF)
3333

34-
execute_process(COMMAND git describe --tags --long --always --dirty
34+
execute_process(COMMAND git describe --tags --always --dirty
3535
OUTPUT_VARIABLE GIT_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE)
3636
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGIT_REVISION=\"\\\"${GIT_REVISION}\\\"\"")
3737

3838
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
3939
add_library(genomicsqlite SHARED src/genomicsqlite.cc include/genomicsqlite.h src/json1.c src/hardcoded_refseq.hpp)
4040
if(ZSTD_WHOLE_ARCHIVE)
41-
target_link_libraries(genomicsqlite PRIVATE sqlite3 SQLiteCpp -Wl,--whole-archive libzstd.a -Wl,--no-whole-archive)
41+
target_link_libraries(genomicsqlite PRIVATE libsqlite3.so.0 SQLiteCpp -Wl,--whole-archive libzstd.a -Wl,--no-whole-archive)
4242
else()
43-
target_link_libraries(genomicsqlite PRIVATE sqlite3 SQLiteCpp zstd)
43+
target_link_libraries(genomicsqlite PRIVATE libsqlite3.so.0 SQLiteCpp zstd)
4444
endif()
4545

4646

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ WORKDIR /work
1919
RUN wget -nv https://www.sqlite.org/2020/sqlite-amalgamation-${SQLITE_VERSION}.zip \
2020
&& unzip -o sqlite-amalgamation-${SQLITE_VERSION}.zip
2121
WORKDIR /work/sqlite-amalgamation-${SQLITE_VERSION}
22-
RUN gcc -shared -o libsqlite3.so -fPIC -shared -Wl,-soname,libsqlite3.so -g ${CFLAGS} sqlite3.c
23-
RUN cp libsqlite3.so /usr/local/lib && cp *.h /usr/local/include
22+
RUN gcc -shared -o libsqlite3.so.0 -fPIC -shared -Wl,-soname,libsqlite3.so.0 -g ${CFLAGS} sqlite3.c
23+
RUN cp libsqlite3.so.0 /usr/local/lib && cp *.h /usr/local/include
24+
RUN ln -s /usr/local/lib/libsqlite3.so.0 /usr/local/lib/libsqlite3.so
2425

2526
# Zstandard -- hacked with -fPIC for use with ZSTD_WHOLE_ARCHIVE
2627
WORKDIR /work

0 commit comments

Comments
 (0)