From 9318e48a1c07769dcb2f30914a80a971baa3eca4 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 23 Jul 2020 10:09:56 +0200 Subject: [PATCH] Fix installation of libgit2 into wrong libdir Upstream libgit2 has migrated to use the GNUInstallDirs module to decide where things will be installed to by default. While it improves consistency with the host system, we're not really after that when building the vendored libgit2 library, and in fact libgit2.{a,pc} may now be installed into a different directory than before as it started to depend on the host platform. Fix this by explicitly specifying that we want the library and pkgconfig file to be installed into a plain "lib/" directory. --- script/build-libgit2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/build-libgit2.sh b/script/build-libgit2.sh index acbc84a..7398cd9 100755 --- a/script/build-libgit2.sh +++ b/script/build-libgit2.sh @@ -41,6 +41,7 @@ cmake -DTHREADSAFE=ON \ -DCMAKE_C_FLAGS=-fPIC \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_INSTALL_PREFIX="${BUILD_PATH}/install" \ + -DCMAKE_INSTALL_LIBDIR="lib" \ "${VENDORED_PATH}" && exec cmake --build . --target install -- 2.45.2