summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlejandro del Castillo <alejandro.delcastillo@ni.com>2017-03-08 16:01:50 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-11 16:09:14 +0000
commit42dee14477ff688c06b34001f951e4bebc68aa95 (patch)
treee83b5c2072ceffb9c65b64ea61a103a63f7fcebc /meta
parentf4d4f99cfbc2396e49c1613a7d237b9e57f06f81 (diff)
downloadpoky-42dee14477ff688c06b34001f951e4bebc68aa95.tar.gz
libsolv: upgrade to 0.6.26
Drop 0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch (From OE-Core rev: 45de201af696aba70a1eba1573283790947efc54) Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch67
-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 @@
1From 0830ceffb32bdf61dab2a598b9e77f65d089074f Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Fri, 27 Jan 2017 16:10:14 -0600
4Subject: [PATCH] Split libsolvext into it's own pkg-config file
5
6Upstream-Status: Submitted (https://github.com/openSUSE/libsolv/pull/177)
7
8Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
9---
10 CMakeLists.txt | 4 +++-
11 libsolv.pc.in | 4 ++--
12 libsolv.pc.in => libsolvext.pc.in | 4 ++--
13 3 files changed, 7 insertions(+), 5 deletions(-)
14 copy libsolv.pc.in => libsolvext.pc.in (62%)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 82034e0..0777ed9 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -384,9 +384,11 @@ MACRO (SPECFILE)
21 ENDMACRO (SPECFILE)
22
23 MACRO (PCFILE)
24- MESSAGE (STATUS "Writing pkg-config file...")
25+ MESSAGE (STATUS "Writing pkg-config files...")
26 CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolv.pc.in ${CMAKE_BINARY_DIR}/libsolv.pc @ONLY)
27 INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolv.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
28+ CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolvext.pc.in ${CMAKE_BINARY_DIR}/libsolvext.pc @ONLY)
29+ INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolvext.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
30 ENDMACRO (PCFILE)
31
32 SPECFILE ()
33diff --git a/libsolv.pc.in b/libsolv.pc.in
34index c82dfc4..40a8623 100644
35--- a/libsolv.pc.in
36+++ b/libsolv.pc.in
37@@ -2,7 +2,7 @@ libdir=@LIB_INSTALL_DIR@
38 includedir=@INCLUDE_INSTALL_DIR@
39
40 Name: libsolv
41-Description: Library for solving packages and reading repositories
42+Description: Library for solving packages
43 Version: @VERSION@
44-Libs: -L${libdir} -lsolvext -lsolv
45+Libs: -L${libdir} -lsolv
46 Cflags: -I${includedir}
47diff --git a/libsolv.pc.in b/libsolvext.pc.in
48similarity index 62%
49copy from libsolv.pc.in
50copy to libsolvext.pc.in
51index c82dfc4..6395f39 100644
52--- a/libsolv.pc.in
53+++ b/libsolvext.pc.in
54@@ -1,8 +1,8 @@
55 libdir=@LIB_INSTALL_DIR@
56 includedir=@INCLUDE_INSTALL_DIR@
57
58-Name: libsolv
59-Description: Library for solving packages and reading repositories
60+Name: libsolvext
61+Description: Library for reading repositories
62 Version: @VERSION@
63 Libs: -L${libdir} -lsolvext -lsolv
64 Cflags: -I${includedir}
65--
662.7.4
67
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"
8DEPENDS = "expat zlib" 8DEPENDS = "expat zlib"
9 9
10SRC_URI = "git://github.com/openSUSE/libsolv.git \ 10SRC_URI = "git://github.com/openSUSE/libsolv.git \
11 file://0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch \
12 " 11 "
13SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch" 12SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch"
14 13
15SRCREV = "4049d57b026d3a67c8c164ed20db85ff62b87728" 14SRCREV = "ba32f8286d3deec6faaabc79762a4760e9af0a07"
16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
17 16
18S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"