diff options
author | alperak <alperyasinak1@gmail.com> | 2024-10-01 19:57:43 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-11-19 13:13:26 -0800 |
commit | 2734b7804dae45e24f0c9d569d858803fa330962 (patch) | |
tree | 134879e70c08d822359cf8873ebc6f4765233799 | |
parent | 48e7ded364452a7ae7c2625d371f4c55ab587933 (diff) | |
download | meta-openembedded-2734b7804dae45e24f0c9d569d858803fa330962.tar.gz |
curlpp: Fix build issue
Signed-off-by: alperak <alperyasinak1@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 56010090ef75da2a3d564e16ee046a709da4a650)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch | 36 | ||||
-rw-r--r-- | meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb | 3 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch new file mode 100644 index 000000000..1712a5346 --- /dev/null +++ b/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001 | ||
2 | From: alperak <alperyasinak1@gmail.com> | ||
3 | Date: Tue, 1 Oct 2024 19:45:38 +0300 | ||
4 | Subject: [PATCH] Fix invalid conversion from int to CURLoption | ||
5 | |||
6 | Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive] | ||
7 | 281 | typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
8 | | ^ | ||
9 | | | | ||
10 | | int | ||
11 | |||
12 | Fix invalid conversion by adding explicit cast to CURLoption | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
17 | --- | ||
18 | include/curlpp/Options.hpp | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp | ||
22 | index c705c9d..7c9a501 100644 | ||
23 | --- a/include/curlpp/Options.hpp | ||
24 | +++ b/include/curlpp/Options.hpp | ||
25 | @@ -278,7 +278,7 @@ namespace options | ||
26 | typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; | ||
27 | typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; | ||
28 | typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; | ||
29 | - typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
30 | + typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; | ||
31 | typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; | ||
32 | typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; | ||
33 | typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout; | ||
34 | -- | ||
35 | 2.25.1 | ||
36 | |||
diff --git a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 131f1873a..cacdc9773 100644 --- a/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb | |||
@@ -8,7 +8,8 @@ DEPENDS = "curl" | |||
8 | DEPENDS:class-native = "curl-native" | 8 | DEPENDS:class-native = "curl-native" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ |
11 | file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch" | 11 | file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ |
12 | file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch" | ||
12 | 13 | ||
13 | SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" | 14 | SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" |
14 | 15 | ||