summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2015-06-29 12:20:01 +0200
committerVicent Marti <tanoku@gmail.com>2015-06-29 12:20:01 +0200
commit6a5fb1f4cc5cb8de311acf1af6b7d8a0ea35876e (patch)
tree31339e0df974159d2cc46eca700a8b6be153e84b
parent84d5a98f806cb80b97fcf81558d91a183b26cb1c (diff)
downloadlibgit2-vmg/pkg-config-sort.tar.gz
pkg-config: Sort the different sectionsvmg/pkg-config-sort
Because of the fact that pkg-config is pants-on-head retarded and that the Linux linker *requires* a static library to come before all its dynamic dependencies in the link path, calling `pkg-config --libs --static` was generating the wrong flags for linking. Before this patch: -Wl,-Bsymbolic-functions -Wl,-z,relro -L/usr/local/lib -lcurl -lssh2 -lrt -lgit2 -lssl -lcrypto -ldl -lz After this patch: -Wl,-Bsymbolic-functions -Wl,-z,relro -L/usr/local/lib -lgit2 -lcurl -lssh2 -lrt -lssl -lcrypto -ldl -lz By setting the "Libs" line before all other rules, we make sure that `-lgit2` is the first library in the link path and that it gets its symbols resolved with the libraries coming after it. This fix (ab)uses an implementation detail in `pkg-config` (namely, that flags are output as they are found on the file), but this detail seems to be stable between releases and always gives a stable output.
-rw-r--r--libgit2.pc.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/libgit2.pc.in b/libgit2.pc.in
index 8f5279234..3d825a49f 100644
--- a/libgit2.pc.in
+++ b/libgit2.pc.in
@@ -4,7 +4,9 @@ includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
Name: libgit2
Description: The git library, take 2
Version: @LIBGIT2_VERSION_STRING@
-Requires.private: @LIBGIT2_PC_REQUIRES@
-Libs.private: @LIBGIT2_PC_LIBS@
+
Libs: -L${libdir} -lgit2
+Libs.private: @LIBGIT2_PC_LIBS@
+Requires.private: @LIBGIT2_PC_REQUIRES@
+
Cflags: -I${includedir}