From 45de201af696aba70a1eba1573283790947efc54 Mon Sep 17 00:00:00 2001 From: Alejandro del Castillo Date: Wed, 8 Mar 2017 16:01:50 -0600 Subject: libsolv: upgrade to 0.6.26 Drop 0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch Signed-off-by: Alejandro del Castillo Signed-off-by: Ross Burton --- ...-libsolvext-into-it-s-own-pkg-config-file.patch | 67 ---------------------- meta/recipes-extended/libsolv/libsolv_0.6.24.bb | 30 ---------- meta/recipes-extended/libsolv/libsolv_0.6.26.bb | 29 ++++++++++ 3 files changed, 29 insertions(+), 97 deletions(-) delete mode 100644 meta/recipes-extended/libsolv/libsolv/0001-Split-libsolvext-into-it-s-own-pkg-config-file.patch delete mode 100644 meta/recipes-extended/libsolv/libsolv_0.6.24.bb create mode 100644 meta/recipes-extended/libsolv/libsolv_0.6.26.bb (limited to 'meta/recipes-extended/libsolv') 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 -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 ---- - 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.24.bb deleted file mode 100644 index 73db5ed2cc..0000000000 --- a/meta/recipes-extended/libsolv/libsolv_0.6.24.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Library for solving packages and reading repositories" -HOMEPAGE = "https://github.com/openSUSE/libsolv" -BUGTRACKER = "https://github.com/openSUSE/libsolv/issues" -SECTION = "devel" -LICENSE = "BSD-3-Clause" -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" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON" - -PACKAGES =+ "${PN}-tools ${PN}ext" - -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibSolv.cmake" -FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}ext = "${libdir}/${PN}ext.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.26.bb b/meta/recipes-extended/libsolv/libsolv_0.6.26.bb new file mode 100644 index 0000000000..d46fca8e24 --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv_0.6.26.bb @@ -0,0 +1,29 @@ +SUMMARY = "Library for solving packages and reading repositories" +HOMEPAGE = "https://github.com/openSUSE/libsolv" +BUGTRACKER = "https://github.com/openSUSE/libsolv/issues" +SECTION = "devel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" + +DEPENDS = "expat zlib" + +SRC_URI = "git://github.com/openSUSE/libsolv.git \ + " +SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch" + +SRCREV = "ba32f8286d3deec6faaabc79762a4760e9af0a07" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON" + +PACKAGES =+ "${PN}-tools ${PN}ext" + +FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibSolv.cmake" +FILES_${PN}-tools = "${bindir}/*" +FILES_${PN}ext = "${libdir}/${PN}ext.so.*" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg