File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -31,16 +31,16 @@ set(CMAKE_CXX_STANDARD 11)
3131set (CMAKE_CXX_STANDARD_REQUIRED ON )
3232set (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
3838include_directories (${CMAKE_CURRENT_SOURCE_DIR} /include )
3939add_library (genomicsqlite SHARED src/genomicsqlite.cc include /genomicsqlite.h src/json1.c src/hardcoded_refseq.hpp )
4040if (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 )
4242else ()
43- target_link_libraries (genomicsqlite PRIVATE sqlite3 SQLiteCpp zstd )
43+ target_link_libraries (genomicsqlite PRIVATE libsqlite3.so.0 SQLiteCpp zstd )
4444endif ()
4545
4646
Original file line number Diff line number Diff line change @@ -19,8 +19,9 @@ WORKDIR /work
1919RUN wget -nv https://www.sqlite.org/2020/sqlite-amalgamation-${SQLITE_VERSION}.zip \
2020 && unzip -o sqlite-amalgamation-${SQLITE_VERSION}.zip
2121WORKDIR /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
2627WORKDIR /work
You can’t perform that action at this time.
0 commit comments