mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-08 05:29:22 +00:00
Code Issues Projects Releases Wiki Activity

konkretcmpi: Update and fix build with latest oe-core

Browse Source 
Drop already upstreamed patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-06-01 23:50:15 -07:00
committed by Martin Jansa
parent e7bd0b9910
commit fb26fdcda0
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch
+38
View File
@@ -0,0 +1,38 @@
From 45e1c4c04a126d2386446775f99084bd603016af Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 1 Jun 2017 23:10:59 -0700
Subject: [PATCH] drop including rpath cmake module
Fixes cross compilation QA errors e.g.
/usr/lib/libkonkret.so.0.0.1 contains probably-redundant RPATH /usr/lib [useless-rpaths]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/konkret/CMakeLists.txt | 1 -
src/program/CMakeLists.txt | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/konkret/CMakeLists.txt b/src/konkret/CMakeLists.txt
index c2faa40..df49e11 100644
--- a/src/konkret/CMakeLists.txt
+++ b/src/konkret/CMakeLists.txt
@@ -8,7 +8,6 @@ set(konkret_SRCS
kstr.c
print.c
)
-include(rpath)
include_directories(${CMPI_INCLUDE_DIR})
add_library(libkonkret SHARED ${konkret_SRCS})
diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt
index afcefe5..8a4646c 100644
--- a/src/program/CMakeLists.txt
+++ b/src/program/CMakeLists.txt
@@ -1,4 +1,3 @@
-include (rpath)
include_directories(${CMPI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src)
add_executable(konkret main.cpp)
--
2.13.0
meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch
-38
View File
@@ -1,38 +0,0 @@
Port from Fedora20
| commit aca6c7f910ffe9930b5789969f0adfadd668bb46
| Author: Michal Minar <miminar@redhat.com>
| Date: Fri Jun 20 10:50:45 2014 +0200
|
| Fix returning instance as an output argument from method
|
| Submitted By: Radek Novacek <rnovacek@redhat.com>
Upstream-Status: Pending
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
diff --git a/src/program/main.cpp b/src/program/main.cpp
index 885dc12..9e7108a 100644
--- a/src/program/main.cpp
+++ b/src/program/main.cpp
@@ -506,7 +506,11 @@ static void gen_feature_decls(
// Add sig entry [type][length][name][zero-terminator]
- KTag tag = _ktag(pd->data_type, pd->array_index, key, false, false);
+ KTag tag;
+ if (pd->qualifiers->has_key("EmbeddedInstance"))
+ tag = _ktag(TOK_INSTANCE, pd->array_index, key, false, false);
+ else
+ tag = _ktag(pd->data_type, pd->array_index, key, false, false);
pack_tag(sig, tag);
pack_name(sig, pd->name);
count++;
@@ -640,6 +644,7 @@ static void gen_param(FILE* os, MOF_Parameter* p, vector<unsigned char>& sig)
const char* ktn = _ktype_name(p->data_type);
if (p->qualifiers->has_key("EmbeddedInstance")) {
+ tag = _ktag(TOK_INSTANCE, p->array_index, false, in, out);
if (p->array_index)
put(os, " KInstanceA $0;\n", p->name, NULL);
else
meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
+2 -2
View File
@@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873"
DEPENDS = "swig-native sblim-cmpi-devel python"
SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \
file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \
file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \
file://0001-drop-including-rpath-cmake-module.patch \
"
SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769"
SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7"
S = "${WORKDIR}/git"
inherit cmake