From 243d6bfd2bcc15b050ab433cafcedd5bdc679c9f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 3 Dec 2023 17:44:55 -0800 Subject: [PATCH] stop building our own libgit2 for Ubuntu 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 --- packaging/ubuntu/debian/rules | 6 ------ packaging/ubuntu/make-package.sh | 14 +------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index c2c690078..d61d2e2b4 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -36,7 +36,6 @@ override_dh_auto_clean: rm -f libdivecomputer/missing rm -f libdivecomputer/src/Makefile.in rm -rf install-root - rm -rf libgit2/build rm -rf googlemaps/build rm -rf subsurface-build @@ -53,15 +52,10 @@ override_dh_auto_configure: ./configure --disable-examples --prefix=$(MY_INSTALL_ROOT) --disable-shared ; \ make -j8 ; \ 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 ; \ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBGIT2_INCLUDE_DIR=$(MY_INSTALL_ROOT)/include \ - -DLIBGIT2_LIBRARIES=$(MY_INSTALL_ROOT)/lib/libgit2.a \ -DLIBDIVECOMPUTER_INCLUDE_DIR=$(MY_INSTALL_ROOT)/include \ -DLIBDIVECOMPUTER_LIBRARIES=$(MY_INSTALL_ROOT)/lib/libdivecomputer.a \ -DFORCE_LIBSSH=1 \ diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index b2201b0c6..6ea93eedd 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -15,12 +15,6 @@ if [[ ! -d googlemaps ]] ; then exit 1; 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 cd subsurface git submodule init @@ -52,14 +46,8 @@ if [[ ! -d subsurface_$VERSION ]]; then (cd ../subsurface ; tar cf - . ) | (cd subsurface_$VERSION ; tar xf - ) cd subsurface_$VERSION; cp -a ../../googlemaps . - cp -a ../../libgit2 . - # now make sure we have libgit2 1.0 - 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 + rm -rf .git libdivecomputer/.git googlemaps/.git build build-mobile libdivecomputer/build googlemaps/build echo $GITVERSION > .gitversion echo $GITDATE > .gitdate echo $LIBDCREVISION > libdivecomputer/revision