diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-05-20 15:51:21 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:11:13 +0100 |
commit | fb51dc9ede90548cf7d3854f8fa77ae6c93289df (patch) | |
tree | c0b59f66032f582ca92df71cfb9bf64a03496e12 /meta/recipes-extended/libsolv/libsolv | |
parent | 133ad838ceec5bcd51adc76975720c99a68f6830 (diff) | |
download | poky-fb51dc9ede90548cf7d3854f8fa77ae6c93289df.tar.gz |
libsolv: update to 0.6.21
0.6.20 -> 0.6.21
Remove upstreamed patch:
1. 0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch
(From OE-Core rev: 504a82289e42eb76268852015f0c5e463ced5556)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libsolv/libsolv')
-rw-r--r-- | meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch | 37 |
1 files changed, 0 insertions, 37 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 deleted file mode 100644 index 972ecc9c53..0000000000 --- a/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Wed, 6 Apr 2016 23:15:02 -0700 | ||
4 | Subject: [PATCH] CMakeLists.txt: fix MAN_INSTALL_DIR | ||
5 | |||
6 | It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may | ||
7 | not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/", | ||
8 | it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it | ||
9 | doesn't exist, and the man dir would be set to "/usr/man" which is | ||
10 | incorrect. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | CMakeLists.txt | 5 +---- | ||
17 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
20 | index 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 | -- | ||
36 | 2.7.4 | ||
37 | |||