mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

stop building our own libgit2 for Ubuntu

Browse source 
It's embarrassing that we kept doing this for so long. Debian and Ubuntu
have had new enough versions of libgit2 for a very long time.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-03 17:44:55 -08:00
parent 8e212c0858
commit 243d6bfd2b
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/ubuntu/debian/rules
View file

@ -36,7 +36,6 @@ override_dh_auto_clean:
rm -f libdivecomputer/missing rm -f libdivecomputer/missing
rm -f libdivecomputer/src/Makefile.in rm -f libdivecomputer/src/Makefile.in
rm -rf install-root rm -rf install-root
rm -rf libgit2/build
rm -rf googlemaps/build rm -rf googlemaps/build
rm -rf subsurface-build rm -rf subsurface-build
@ -53,15 +52,10 @@ override_dh_auto_configure:
./configure --disable-examples --prefix=$(MY_INSTALL_ROOT) --disable-shared ; \ ./configure --disable-examples --prefix=$(MY_INSTALL_ROOT) --disable-shared ; \
make -j8 ; \ make -j8 ; \
make install) make install)
(mkdir libgit2/build ; cd libgit2/build ; \
cmake -DCMAKE_INSTALL_PREFIX=$(MY_INSTALL_ROOT) -DBUILD_SHARED_LIBS=OFF -DBUILD_CLAR=OFF -DREGEX_BACKEND=builtin .. ; \
make -j8 ; \
make install)
(mkdir subsurface-build ; cd subsurface-build ; \ (mkdir subsurface-build ; cd subsurface-build ; \
cmake -DCMAKE_BUILD_TYPE=Release \ cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DLIBGIT2_INCLUDE_DIR=$(MY_INSTALL_ROOT)/include \ -DLIBGIT2_INCLUDE_DIR=$(MY_INSTALL_ROOT)/include \
-DLIBGIT2_LIBRARIES=$(MY_INSTALL_ROOT)/lib/libgit2.a \
-DLIBDIVECOMPUTER_INCLUDE_DIR=$(MY_INSTALL_ROOT)/include \ -DLIBDIVECOMPUTER_INCLUDE_DIR=$(MY_INSTALL_ROOT)/include \
-DLIBDIVECOMPUTER_LIBRARIES=$(MY_INSTALL_ROOT)/lib/libdivecomputer.a \ -DLIBDIVECOMPUTER_LIBRARIES=$(MY_INSTALL_ROOT)/lib/libdivecomputer.a \
-DFORCE_LIBSSH=1 \ -DFORCE_LIBSSH=1 \

14
packaging/ubuntu/make-package.sh
View file

@ -15,12 +15,6 @@ if [[ ! -d googlemaps ]] ; then
exit 1; exit 1;
fi fi
if [[ ! -d libgit2 ]] ; then
echo "Please make sure you have libgit2 1.0 from https://github.com/libgit2/libgit2"
echo "checked out in parallel to the Subsurface directory"
exit 1;
fi
# ensure that the libdivecomputer module is there and current # ensure that the libdivecomputer module is there and current
cd subsurface cd subsurface
git submodule init git submodule init
@ -52,14 +46,8 @@ if [[ ! -d subsurface_$VERSION ]]; then
(cd ../subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - ) (cd ../subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - )
cd subsurface_$VERSION; cd subsurface_$VERSION;
cp -a ../../googlemaps . cp -a ../../googlemaps .
cp -a ../../libgit2 .
# now make sure we have libgit2 1.0 rm -rf .git libdivecomputer/.git googlemaps/.git build build-mobile libdivecomputer/build googlemaps/build
cd libgit2
git fetch
git checkout v1.0.0
cd ..
rm -rf .git libdivecomputer/.git googlemaps/.git build build-mobile libdivecomputer/build googlemaps/build libgit2/.git libgit2/build
echo $GITVERSION > .gitversion echo $GITVERSION > .gitversion
echo $GITDATE > .gitdate echo $GITDATE > .gitdate
echo $LIBDCREVISION > libdivecomputer/revision echo $LIBDCREVISION > libdivecomputer/revision