libdnf: add a recipe
libdnf is required by dnf. (From OE-Core rev: 8ac3fb682928aeb076c8f78fb429936ae747bc77) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
bbddf83f65
commit
374494e746
|
@ -0,0 +1,31 @@
|
|||
From 9bb7630915c3e787732463a3e2064fe0e177101b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 24 Nov 2016 14:33:07 +0200
|
||||
Subject: [PATCH 1/4] FindGtkDoc.cmake: drop the requirement for
|
||||
GTKDOC_SCANGOBJ_WRAPPER
|
||||
|
||||
For some reason cmake is not able to find it when building in openembedded,
|
||||
and it's bundled with the source code anyway.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
cmake/modules/FindGtkDoc.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake
|
||||
index 92b2cc7..39f34bd 100644
|
||||
--- a/cmake/modules/FindGtkDoc.cmake
|
||||
+++ b/cmake/modules/FindGtkDoc.cmake
|
||||
@@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin")
|
||||
find_program(GTKDOC_FIXXREF_EXE gtkdoc-fixxref PATH "${GLIB_PREFIX}/bin")
|
||||
|
||||
find_package_handle_standard_args(GtkDoc
|
||||
- REQUIRED_VARS GTKDOC_SCAN_EXE GTKDOC_SCANGOBJ_EXE GTKDOC_SCANGOBJ_WRAPPER GTKDOC_MKDB_EXE GTKDOC_MKHTML_EXE GTKDOC_FIXXREF_EXE
|
||||
+ REQUIRED_VARS GTKDOC_SCAN_EXE GTKDOC_SCANGOBJ_EXE GTKDOC_MKDB_EXE GTKDOC_MKHTML_EXE GTKDOC_FIXXREF_EXE
|
||||
VERSION_VAR GtkDoc_VERSION)
|
||||
|
||||
# ::
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 5958b151a4dbb89114e90c971a34b74f873b7beb Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 7 Feb 2017 12:16:03 +0200
|
||||
Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is
|
||||
using both)
|
||||
|
||||
Upstream-Status: Pending [depends on whether https://github.com/openSUSE/libsolv/pull/177 is accepted]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b531da1..e512da0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ find_package (PkgConfig REQUIRED)
|
||||
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
|
||||
PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)
|
||||
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
|
||||
-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
||||
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
|
||||
set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
||||
pkg_check_modules (CHECK REQUIRED check)
|
||||
pkg_check_modules (REPO REQUIRED librepo)
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From c8211ad99ccaa4af4a75e0ba639527267fcfd69e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:17:19 +0200
|
||||
Subject: [PATCH 2/4] Prefix sysroot path to introspection tools path.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
libdnf/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libdnf/CMakeLists.txt b/libdnf/CMakeLists.txt
|
||||
index 63f07bf..837792b 100644
|
||||
--- a/libdnf/CMakeLists.txt
|
||||
+++ b/libdnf/CMakeLists.txt
|
||||
@@ -133,7 +133,7 @@ if (GOBJECT_INTROSPECTION_FOUND)
|
||||
set(GIR_TYPELIB "${GIR_PREFIX}.typelib")
|
||||
|
||||
add_custom_command(OUTPUT ${GIR_XML}
|
||||
- COMMAND env CFLAGS=${CMAKE_C_FLAGS} ${GOBJECT_INTROSPECTION_1.0_G_IR_SCANNER}
|
||||
+ COMMAND env CFLAGS=${CMAKE_C_FLAGS} $ENV{PKG_CONFIG_SYSROOT_DIR}${GOBJECT_INTROSPECTION_1.0_G_IR_SCANNER}
|
||||
--namespace=Dnf
|
||||
--nsversion=${DNF_SO_VERSION}.0
|
||||
--library-path=${CMAKE_CURRENT_BINARY_DIR}
|
||||
@@ -153,7 +153,7 @@ if (GOBJECT_INTROSPECTION_FOUND)
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
add_custom_command(OUTPUT ${GIR_TYPELIB}
|
||||
- COMMAND ${GOBJECT_INTROSPECTION_1.0_G_IR_COMPILER}
|
||||
+ COMMAND $ENV{PKG_CONFIG_SYSROOT_DIR}${GOBJECT_INTROSPECTION_1.0_G_IR_COMPILER}
|
||||
-o ${GIR_TYPELIB}
|
||||
${GIR_XML}
|
||||
DEPENDS ${GIR_XML}
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 8d29879fe3606c78769c1bcdddf0bcfc7191c710 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:20:01 +0200
|
||||
Subject: [PATCH 3/4] Set the library installation directory correctly.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d35f0d7..8edb627 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -62,7 +62,9 @@ ADD_DEFINITIONS(-DPACKAGE_VERSION=\\"${LIBDNF_VERSION}\\")
|
||||
IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
SET (LIB_SUFFIX "64")
|
||||
ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
-SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
||||
+#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
||||
+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
|
||||
+
|
||||
|
||||
ADD_SUBDIRECTORY (libdnf)
|
||||
ENABLE_TESTING()
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 6d2718b925453f9a6915001f489606eb8e4086c8 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:24:50 +0200
|
||||
Subject: [PATCH 4/4] Set libsolv variables with pkg-config (cmake's own module
|
||||
doesn't work properly).
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8edb627..b531da1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,7 +28,8 @@ find_package (PkgConfig REQUIRED)
|
||||
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
|
||||
PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)
|
||||
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
|
||||
-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)
|
||||
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
||||
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
||||
pkg_check_modules (CHECK REQUIRED check)
|
||||
pkg_check_modules (REPO REQUIRED librepo)
|
||||
FIND_PROGRAM (VALGRIND_PROGRAM NAMES valgrind PATH /usr/bin /usr/local/bin)
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
SUMMARY = "Library providing simplified C and Python API to libsolv"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/libdnf \
|
||||
file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \
|
||||
file://0002-Prefix-sysroot-path-to-introspection-tools-path.patch \
|
||||
file://0003-Set-the-library-installation-directory-correctly.patch \
|
||||
file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
|
||||
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
|
||||
"
|
||||
|
||||
PV = "0.2.3+git${SRCPV}"
|
||||
SRCREV = "367545629cc01a8e622890d89bd13d062ce60d7b"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc"
|
||||
|
||||
inherit gtk-doc gobject-introspection cmake pkgconfig
|
||||
|
||||
# We cannot inherit pythonnative (or descendant classes like distutils etc.)
|
||||
# because that would conflict with inheriting python3native
|
||||
# (which is done by inheriting gobject-introspection).
|
||||
# But libdnf only needs the path to native Python 2.x binary
|
||||
# so we simply set it explicitly here.
|
||||
#
|
||||
# These lines can be dropped when dnf stack is moved to python 3.x
|
||||
EXTRANATIVEPATH += "python-native"
|
||||
FILES_${PN} += " ${libdir}/python2.7/*"
|
||||
DEPENDS += "python-native"
|
||||
|
||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF \
|
||||
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \
|
||||
"
|
||||
EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF"
|
||||
EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
Loading…
Reference in New Issue