mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 01:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow static libgit2

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-12-01 18:45:41 -08:00
parent 74447d6389
commit ebd22b9abc
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/ubuntu/rules
View file

@ -18,8 +18,8 @@ override_dh_auto_clean:
override_dh_auto_configure: override_dh_auto_configure:
(cd libdivecomputer ; autoreconf --install ; ./configure ; make) (cd libdivecomputer ; autoreconf --install ; ./configure ; make)
(mkdir libgit2/build ; cd libgit2/build ; cmake .. ; make ) (mkdir libgit2/build ; cd libgit2/build ; cmake -DBUILD_SHARED_LIBS=OFF .. ; sed -i 's/.so$/.a/' CMakeCache.txt ; make )
qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 subsurface.pro qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 subsurface.pro
override_dh_installchangelogs: override_dh_installchangelogs:
dh_installchangelogs dh_installchangelogs

4
subsurface-configure.pri
View file

@ -137,7 +137,11 @@ isEmpty(LIBGIT2DEVEL) {
PKGCONFIG += libgit2 PKGCONFIG += libgit2
} else { } else {
INCLUDEPATH += $$LIBGIT2DEVEL/include INCLUDEPATH += $$LIBGIT2DEVEL/include
isEmpty(LIBGIT2STATIC) {
LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto
} else {
LIBS += $$LIBGIT2DEVEL/build/libgit2.a -Wl,-Bstatic -lz -lssl -lcrypto -Wl,-Bdynamic -ldl
}
} }
# Add libiconv if needed # Add libiconv if needed