summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-30 22:50:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-02 11:06:00 +0000
commited9414e1b8498f08421847ee260552f5169ee1c4 (patch)
treefee17a23b818242ecfd15d771790951cf3dd39ec
parentdf12337a3132c2df86b20bfc378b72234cda79e9 (diff)
downloadpoky-ed9414e1b8498f08421847ee260552f5169ee1c4.tar.gz
libdnf: Fix build with clang/libc++
(From OE-Core rev: 562d32ec1ff905aa5aa31fe8b2d86045c1eaaab6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch65
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.24.1.bb1
2 files changed, 66 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch b/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
new file mode 100644
index 0000000000..62de784820
--- /dev/null
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
@@ -0,0 +1,65 @@
1From ccc89ff0c1f8e55a4a22444d051925408f265df1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 30 Jan 2019 10:32:11 -0800
4Subject: [PATCH] include missing <string> and errno.h headers
5
6This is unearthed when compiling with clang/libc++
7
8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/677]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 libdnf/conf/ConfigParser.hpp | 1 +
13 libdnf/module/modulemd/ModuleProfile.hpp | 1 +
14 libdnf/sack/changelog.hpp | 1 +
15 libdnf/utils/smartcols/Cell.hpp | 1 +
16 4 files changed, 4 insertions(+)
17
18diff --git a/libdnf/conf/ConfigParser.hpp b/libdnf/conf/ConfigParser.hpp
19index 97f25500..2a3851fa 100644
20--- a/libdnf/conf/ConfigParser.hpp
21+++ b/libdnf/conf/ConfigParser.hpp
22@@ -23,6 +23,7 @@
23
24 #include <map>
25 #include <stdexcept>
26+#include <string>
27 #include <utility>
28
29 namespace libdnf {
30diff --git a/libdnf/module/modulemd/ModuleProfile.hpp b/libdnf/module/modulemd/ModuleProfile.hpp
31index ab018deb..8d996ff4 100644
32--- a/libdnf/module/modulemd/ModuleProfile.hpp
33+++ b/libdnf/module/modulemd/ModuleProfile.hpp
34@@ -23,6 +23,7 @@
35
36
37 #include <memory>
38+#include <string>
39 #include <vector>
40
41 #include <modulemd/modulemd.h>
42diff --git a/libdnf/sack/changelog.hpp b/libdnf/sack/changelog.hpp
43index a3d3fc44..d830c414 100644
44--- a/libdnf/sack/changelog.hpp
45+++ b/libdnf/sack/changelog.hpp
46@@ -23,6 +23,7 @@
47 #define __CHANGELOG_HPP
48
49 #include <ctime>
50+#include <string>
51
52 namespace libdnf {
53
54diff --git a/libdnf/utils/smartcols/Cell.hpp b/libdnf/utils/smartcols/Cell.hpp
55index 2e811dee..b90f0050 100644
56--- a/libdnf/utils/smartcols/Cell.hpp
57+++ b/libdnf/utils/smartcols/Cell.hpp
58@@ -22,6 +22,7 @@
59 #define LIBDNF_CELL_HPP
60
61 #include <libsmartcols/libsmartcols.h>
62+#include <cerrno>
63 #include <string>
64 #include <stdexcept>
65
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb
index e379d8b256..a55acb2ef0 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.24.1.bb
@@ -7,6 +7,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
7 file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ 7 file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
8 file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ 8 file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
9 file://0001-Add-WITH_TESTS-option.patch \ 9 file://0001-Add-WITH_TESTS-option.patch \
10 file://0001-include-missing-string-and-errno.h-headers.patch \
10 " 11 "
11 12
12SRCREV = "04b71d78a2170e930a3c248d48a231b19f823064" 13SRCREV = "04b71d78a2170e930a3c248d48a231b19f823064"