diff options
| author | Patrick Steinhardt <[email protected]> | 2020-07-25 22:08:04 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-25 13:08:04 -0700 |
| commit | d8f9990d4d0af1f80c13aa3ff256b004c7cadc46 (patch) | |
| tree | 32ad3b9199d61ace2c0125efacdbf8b322b70199 | |
| parent | b1cad11555ac966c1575375eb69ebb6c6463b27f (diff) | |
Fix installation of libgit2 into wrong libdir (#624)
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.
| -rwxr-xr-x | script/build-libgit2.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 |