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:09:21 +0100 |
| commit | 504a82289e42eb76268852015f0c5e463ced5556 (patch) | |
| tree | 298c8720001caaacdc6839db8cea3b6c1730af02 /meta/recipes-extended | |
| parent | 378608a99560c7720189ca6ba4158e10cbe42abf (diff) | |
| download | openembedded-core-contrib-504a82289e42eb76268852015f0c5e463ced5556.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
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-extended/libsolv/libsolv_git.bb | 5 |
2 files changed, 2 insertions, 40 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 972ecc9c532..00000000000 --- a/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Wed, 6 Apr 2016 23:15:02 -0700 -Subject: [PATCH] CMakeLists.txt: fix MAN_INSTALL_DIR - -It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may -not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/", -it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it -doesn't exist, and the man dir would be set to "/usr/man" which is -incorrect. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd1426b..747db22 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,10 +57,7 @@ else (DEFINED INCLUDE) - ENDIF (DEFINED INCLUDE) - MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}") - SET (BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") --SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man") --IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man") -- SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man") --ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man") -+SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man") - MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}") - - #################################################################### --- -2.7.4 - diff --git a/meta/recipes-extended/libsolv/libsolv_git.bb b/meta/recipes-extended/libsolv/libsolv_git.bb index a16897e7d67..b41347d75c3 100644 --- a/meta/recipes-extended/libsolv/libsolv_git.bb +++ b/meta/recipes-extended/libsolv/libsolv_git.bb @@ -7,14 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib" -PV = "0.6.20" +PV = "0.6.21" SRC_URI = "git://github.com/openSUSE/libsolv.git \ - file://0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch \ " SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch" -SRCREV = "513c572b10e18bea5ac78709267de4b739cb31e7" +SRCREV = "bdb5c63245923ed95cf04086b65b2e5a5b5d7b04" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |