debian/patches/fix-installation-in-wrong-location.patch

   1 From fbda0575b133a57d8f5d264742098994c7624c99 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczko.tomasz@gmail.com>
   3 Date: Wed, 19 Feb 2020 12:54:19 +0000
   4 Subject: [PATCH] Fix #5410: fix installing libgit2.pc in wrong location
   5
   6 Remove using custom PKG_BUILD_PREFIu, PKG_BUILD_LIBDIR and
   7 PKG_BUILD_INCLUDEDIR variables.
   8 Use cmake CMAKE_INSTALL_PREFIX, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR instead.
   9 This patch fixes install libgit2.pc file in correct location and simpifies
  10 cmake module.
  11 ---
  12  cmake/Modules/PkgBuildConfig.cmake | 39 +++---------------------------
  13  1 file changed, 4 insertions(+), 35 deletions(-)
  14
  15 --- a/cmake/Modules/PkgBuildConfig.cmake
  16 +++ b/cmake/Modules/PkgBuildConfig.cmake
  17 @@ -1,10 +1,5 @@
  18  # pkg-config file generation
  19  #
  20 -# Uses the following globals:
  21 -# - PKG_BUILD_PREFIX: the build location (aka prefix). Defaults to CMAKE_INSTALL_PREFIX
  22 -# - PKG_BUILD_LIBDIR: the libdir location. Defaults to ${prefix}/lib.
  23 -# - PKG_BUILD_INCLUDEDIR: the includedir location. Defaults to ${prefix}/include.
  24 -#
  25
  26  function(pkg_build_config)
  27      set(options)
  28 @@ -29,37 +24,11 @@
  29          message(FATAL_ERROR "Missing VERSION argument")
  30      endif()
  31
  32 -    if (DEFINED PKG_BUILD_PREFIX)
  33 -        set(PKGCONFIG_PREFIX "${PKG_BUILD_PREFIX}")
  34 -    else()
  35 -        set(PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
  36 -    endif()
  37 -
  38 -    if(DEFINED PKG_BUILD_LIBDIR)
  39 -        if (IS_ABSOLUTE ${PKG_BUILD_LIBDIR})
  40 -            set(PKGCONFIG_LIBDIR ${PKG_BUILD_LIBDIR})
  41 -        else()
  42 -            set(PKGCONFIG_LIBDIR "\${prefix}/${PKG_BUILD_LIBDIR}")
  43 -        endif()
  44 -    else()
  45 -        set(PKGCONFIG_LIBDIR "\${prefix}/lib")
  46 -    endif()
  47 -
  48 -    if(DEFINED PKG_BUILD_INCLUDEDIR)
  49 -        if (IS_ABSOLUTE ${PKG_BUILD_INCLUDEDIR})
  50 -            set(PKGCONFIG_INCLUDEDIR ${PKG_BUILD_INCLUDEDIR})
  51 -        else()
  52 -            set(PKGCONFIG_INCLUDEDIR "\${prefix}/${PKG_BUILD_INCLUDEDIR}")
  53 -        endif()
  54 -    else()
  55 -        set(PKGCONFIG_INCLUDEDIR "\${prefix}/include")
  56 -    endif()
  57 -
  58      # Write .pc "header"
  59      file(WRITE "${PKGCONFIG_FILE}"
  60 -        "prefix=\"${PKGCONFIG_PREFIX}\"\n"
  61 -        "libdir=\"${PKGCONFIG_LIBDIR}\"\n"
  62 -        "includedir=\"${PKGCONFIG_INCLUDEDIR}\"\n"
  63 +        "prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"
  64 +        "libdir=\"${LIB_INSTALL_DIR}\"\n"
  65 +        "includedir=\"${INCLUDE_INSTALL_DIR}\"\n"
  66          "\n"
  67          "Name: ${PKGCONFIG_NAME}\n"
  68          "Description: ${PKGCONFIG_DESCRIPTION}\n"
  69 @@ -105,6 +74,6 @@
  70
  71      # Install .pc file
  72      install(FILES "${PKGCONFIG_FILE}"
  73 -        DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig"
  74 +        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
  75      )
  76  endfunction()