Initial commit
This commit is contained in:
+38
@@ -0,0 +1,38 @@
|
||||
From 82bd6d196a0453657cbacaaedd75b2d2fe0bf9ba Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:05:36 +0200
|
||||
Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
||||
---
|
||||
librepo/python/CMakeLists.txt | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/librepo/python/CMakeLists.txt b/librepo/python/CMakeLists.txt
|
||||
index 8523ca7..06e5f7b 100644
|
||||
--- a/librepo/python/CMakeLists.txt
|
||||
+++ b/librepo/python/CMakeLists.txt
|
||||
@@ -16,12 +16,12 @@ SET (librepomodule_SRCS
|
||||
|
||||
MESSAGE("Building python bindings")
|
||||
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
|
||||
-from sys import stdout
|
||||
-from sysconfig import get_path
|
||||
-path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'})
|
||||
-stdout.write(path)"
|
||||
-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
|
||||
+#from sys import stdout
|
||||
+#from sysconfig import get_path
|
||||
+#path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'})
|
||||
+#stdout.write(path)"
|
||||
+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
|
||||
|
||||
MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")
|
||||
--
|
||||
2.25.1
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From 25113b34bc1aae377d7bf447e69528783e2c177e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:23:27 +0200
|
||||
Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
|
||||
(which doesn't work properly)
|
||||
|
||||
Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it]
|
||||
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 a45d5c4..40249e6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -32,7 +32,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
|
||||
PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
|
||||
PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
|
||||
FIND_PACKAGE(CURL 7.52.0 REQUIRED)
|
||||
-FIND_PACKAGE(Gpgme REQUIRED)
|
||||
+PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
|
||||
+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
|
||||
|
||||
|
||||
IF (WITH_ZCHUNK)
|
||||
@@ -0,0 +1,29 @@
|
||||
SUMMARY = "A library providing C and Python (libcURL like) API \
|
||||
for downloading linux repository metadata and packages."
|
||||
HOMEPAGE = "https://github.com/rpm-software-management/librepo"
|
||||
DESCRIPTION = "${SUMMARY}"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \
|
||||
file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
|
||||
file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
|
||||
"
|
||||
|
||||
SRCREV = "5f4de4a4e85845d4184fbd30c03ff8a8ec7df4af"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2"
|
||||
|
||||
inherit cmake setuptools3-base pkgconfig
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \
|
||||
-DPYTHON_DESIRED=3 \
|
||||
-DENABLE_TESTS=OFF \
|
||||
-DENABLE_DOCS=OFF \
|
||||
-DWITH_ZCHUNK=OFF \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user