From e4940da27b629a9ec1962e00b74d5c68b2ef0ecf Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Mon, 23 Mar 2020 17:03:11 +0530 Subject: [PATCH] Add patch to fix installation in wrong location --- .../fix-installation-in-wrong-location.patch | 76 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 77 insertions(+) create mode 100644 debian/patches/fix-installation-in-wrong-location.patch diff --git a/debian/patches/fix-installation-in-wrong-location.patch b/debian/patches/fix-installation-in-wrong-location.patch new file mode 100644 index 000000000..4b7ad7eef --- /dev/null +++ b/debian/patches/fix-installation-in-wrong-location.patch @@ -0,0 +1,76 @@ +From fbda0575b133a57d8f5d264742098994c7624c99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= +Date: Wed, 19 Feb 2020 12:54:19 +0000 +Subject: [PATCH] Fix #5410: fix installing libgit2.pc in wrong location + +Remove using custom PKG_BUILD_PREFIu, PKG_BUILD_LIBDIR and +PKG_BUILD_INCLUDEDIR variables. +Use cmake CMAKE_INSTALL_PREFIX, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR instead. +This patch fixes install libgit2.pc file in correct location and simpifies +cmake module. +--- + cmake/Modules/PkgBuildConfig.cmake | 39 +++--------------------------- + 1 file changed, 4 insertions(+), 35 deletions(-) + +--- a/cmake/Modules/PkgBuildConfig.cmake ++++ b/cmake/Modules/PkgBuildConfig.cmake +@@ -1,10 +1,5 @@ + # pkg-config file generation + # +-# Uses the following globals: +-# - PKG_BUILD_PREFIX: the build location (aka prefix). Defaults to CMAKE_INSTALL_PREFIX +-# - PKG_BUILD_LIBDIR: the libdir location. Defaults to ${prefix}/lib. +-# - PKG_BUILD_INCLUDEDIR: the includedir location. Defaults to ${prefix}/include. +-# + + function(pkg_build_config) + set(options) +@@ -29,37 +24,11 @@ + message(FATAL_ERROR "Missing VERSION argument") + endif() + +- if (DEFINED PKG_BUILD_PREFIX) +- set(PKGCONFIG_PREFIX "${PKG_BUILD_PREFIX}") +- else() +- set(PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}") +- endif() +- +- if(DEFINED PKG_BUILD_LIBDIR) +- if (IS_ABSOLUTE ${PKG_BUILD_LIBDIR}) +- set(PKGCONFIG_LIBDIR ${PKG_BUILD_LIBDIR}) +- else() +- set(PKGCONFIG_LIBDIR "\${prefix}/${PKG_BUILD_LIBDIR}") +- endif() +- else() +- set(PKGCONFIG_LIBDIR "\${prefix}/lib") +- endif() +- +- if(DEFINED PKG_BUILD_INCLUDEDIR) +- if (IS_ABSOLUTE ${PKG_BUILD_INCLUDEDIR}) +- set(PKGCONFIG_INCLUDEDIR ${PKG_BUILD_INCLUDEDIR}) +- else() +- set(PKGCONFIG_INCLUDEDIR "\${prefix}/${PKG_BUILD_INCLUDEDIR}") +- endif() +- else() +- set(PKGCONFIG_INCLUDEDIR "\${prefix}/include") +- endif() +- + # Write .pc "header" + file(WRITE "${PKGCONFIG_FILE}" +- "prefix=\"${PKGCONFIG_PREFIX}\"\n" +- "libdir=\"${PKGCONFIG_LIBDIR}\"\n" +- "includedir=\"${PKGCONFIG_INCLUDEDIR}\"\n" ++ "prefix=\"${CMAKE_INSTALL_PREFIX}\"\n" ++ "libdir=\"${LIB_INSTALL_DIR}\"\n" ++ "includedir=\"${INCLUDE_INSTALL_DIR}\"\n" + "\n" + "Name: ${PKGCONFIG_NAME}\n" + "Description: ${PKGCONFIG_DESCRIPTION}\n" +@@ -105,6 +74,6 @@ + + # Install .pc file + install(FILES "${PKGCONFIG_FILE}" +- DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig" ++ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig" + ) + endfunction() diff --git a/debian/patches/series b/debian/patches/series index 08c699a18..ed695bb5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ disable-online-tests.patch +fix-installation-in-wrong-location.patch