summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch37
-rw-r--r--meta/recipes-extended/libsolv/libsolv_git.bb4
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch b/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch
new file mode 100644
index 0000000000..972ecc9c53
--- /dev/null
+++ b/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch
@@ -0,0 +1,37 @@
1From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 6 Apr 2016 23:15:02 -0700
4Subject: [PATCH] CMakeLists.txt: fix MAN_INSTALL_DIR
5
6It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may
7not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/",
8it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it
9doesn't exist, and the man dir would be set to "/usr/man" which is
10incorrect.
11
12Upstream-Status: Pending
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15---
16 CMakeLists.txt | 5 +----
17 1 file changed, 1 insertion(+), 4 deletions(-)
18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
20index fd1426b..747db22 100644
21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
23@@ -57,10 +57,7 @@ else (DEFINED INCLUDE)
24 ENDIF (DEFINED INCLUDE)
25 MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}")
26 SET (BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
27-SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man")
28-IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
29- SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
30-ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man")
31+SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
32 MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}")
33
34 ####################################################################
35--
362.7.4
37
diff --git a/meta/recipes-extended/libsolv/libsolv_git.bb b/meta/recipes-extended/libsolv/libsolv_git.bb
index c0b012049f..fb81c8a5fa 100644
--- a/meta/recipes-extended/libsolv/libsolv_git.bb
+++ b/meta/recipes-extended/libsolv/libsolv_git.bb
@@ -9,7 +9,9 @@ DEPENDS = "expat zlib"
9 9
10PV = "0.6.19" 10PV = "0.6.19"
11 11
12SRC_URI = "git://github.com/openSUSE/libsolv.git" 12SRC_URI = "git://github.com/openSUSE/libsolv.git \
13 file://0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch \
14"
13SRCREV = "4c5af401a89858d4cebbfe40c59a0031ff9db5b0" 15SRCREV = "4c5af401a89858d4cebbfe40c59a0031ff9db5b0"
14UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
15 17