diff options
author | Alejandro del Castillo <alejandro.delcastillo@ni.com> | 2017-03-08 16:01:50 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-11 16:08:48 +0000 |
commit | 45de201af696aba70a1eba1573283790947efc54 (patch) | |
tree | 4932612ecfa2c769b53e63106d1feb16d893b98e | |
parent | 1ff3de844c78e3766c7f92ca17c308ef3c9427e1 (diff) | |
download | openembedded-core-45de201af696aba70a1eba1573283790947efc54.tar.gz |
libsolv: upgrade to 0.6.26
Drop 0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/recipes-extended/libsolv/libsolv/0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch | 67 | ||||
-rw-r--r-- | meta/recipes-extended/libsolv/libsolv_0.6.26.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.6.24.bb) | 3 |
2 files changed, 1 insertions, 69 deletions
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch b/meta/recipes-extended/libsolv/libsolv/0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch deleted file mode 100644 index 9d9b234a94..0000000000 --- a/meta/recipes-extended/libsolv/libsolv/0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0830ceffb32bdf61dab2a598b9e77f65d089074f Mon Sep 17 00:00:00 2001 -From: Alejandro del Castillo <alejandro.delcastillo@ni.com> -Date: Fri, 27 Jan 2017 16:10:14 -0600 -Subject: [PATCH] Split libsolvext into it's own pkg-config file - -Upstream-Status: Submitted (https://github.com/openSUSE/libsolv/pull/177) - -Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> ---- - CMakeLists.txt | 4 +++- - libsolv.pc.in | 4 ++-- - libsolv.pc.in => libsolvext.pc.in | 4 ++-- - 3 files changed, 7 insertions(+), 5 deletions(-) - copy libsolv.pc.in => libsolvext.pc.in (62%) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 82034e0..0777ed9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -384,9 +384,11 @@ MACRO (SPECFILE) - ENDMACRO (SPECFILE) - - MACRO (PCFILE) -- MESSAGE (STATUS "Writing pkg-config file...") -+ MESSAGE (STATUS "Writing pkg-config files...") - CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolv.pc.in ${CMAKE_BINARY_DIR}/libsolv.pc @ONLY) - INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolv.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -+ CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolvext.pc.in ${CMAKE_BINARY_DIR}/libsolvext.pc @ONLY) -+ INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolvext.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - ENDMACRO (PCFILE) - - SPECFILE () -diff --git a/libsolv.pc.in b/libsolv.pc.in -index c82dfc4..40a8623 100644 ---- a/libsolv.pc.in -+++ b/libsolv.pc.in -@@ -2,7 +2,7 @@ libdir=@LIB_INSTALL_DIR@ - includedir=@INCLUDE_INSTALL_DIR@ - - Name: libsolv --Description: Library for solving packages and reading repositories -+Description: Library for solving packages - Version: @VERSION@ --Libs: -L${libdir} -lsolvext -lsolv -+Libs: -L${libdir} -lsolv - Cflags: -I${includedir} -diff --git a/libsolv.pc.in b/libsolvext.pc.in -similarity index 62% -copy from libsolv.pc.in -copy to libsolvext.pc.in -index c82dfc4..6395f39 100644 ---- a/libsolv.pc.in -+++ b/libsolvext.pc.in -@@ -1,8 +1,8 @@ - libdir=@LIB_INSTALL_DIR@ - includedir=@INCLUDE_INSTALL_DIR@ - --Name: libsolv --Description: Library for solving packages and reading repositories -+Name: libsolvext -+Description: Library for reading repositories - Version: @VERSION@ - Libs: -L${libdir} -lsolvext -lsolv - Cflags: -I${includedir} --- -2.7.4 - diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.24.bb b/meta/recipes-extended/libsolv/libsolv_0.6.26.bb index 73db5ed2cc..d46fca8e24 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.6.24.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.6.26.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git \ - file://0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch \ " SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch" -SRCREV = "4049d57b026d3a67c8c164ed20db85ff62b87728" +SRCREV = "ba32f8286d3deec6faaabc79762a4760e9af0a07" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |