Fix installation of pkg-config file
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
40681597f3
commit
82057debe2
@ -0,0 +1,81 @@
|
|||||||
|
From fbda0575b133a57d8f5d264742098994c7624c99 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczko.tomasz@gmail.com>
|
||||||
|
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(-)
|
||||||
|
|
||||||
|
diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/Modules/PkgBuildConfig.cmake
|
||||||
|
index 1c0079eb0..e4c574431 100644
|
||||||
|
--- 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 @@ function(pkg_build_config)
|
||||||
|
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 @@ function(pkg_build_config)
|
||||||
|
|
||||||
|
# Install .pc file
|
||||||
|
install(FILES "${PKGCONFIG_FILE}"
|
||||||
|
- DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig"
|
||||||
|
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
|
||||||
|
)
|
||||||
|
endfunction()
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
@ -5,6 +5,7 @@ Summary: C implementation of the Git core methods as a library with a sol
|
|||||||
License: GPLv2 with exceptions
|
License: GPLv2 with exceptions
|
||||||
URL: https://libgit2.org/
|
URL: https://libgit2.org/
|
||||||
Source0: https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/libgit2/libgit2/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Patch0001: 0001-Fix-5410-fix-installing-libgit2.pc-in-wrong-location.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: cmake >= 3.5.1
|
BuildRequires: cmake >= 3.5.1
|
||||||
|
Loading…
Reference in New Issue
Block a user