Skip to content

Commit

Permalink
aws-iot-securetunneling-localproxy: fix GCC 13 build
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-roos committed Jan 8, 2024
1 parent ae854c7 commit f99652d
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ SRC_URI = "\
git://[email protected]/aws-samples/aws-iot-securetunneling-localproxy.git;branch=${BRANCH};protocol=https \
file://boost-support-any.patch \
file://gcc13.patch \
file://gcc13_2.patch \
file://run-ptest \
"
SRCREV = "f63f8fd6c7be216e484b066a8330df415a8600cf"
Expand Down
35 changes: 2 additions & 33 deletions recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13.patch
Original file line number Diff line number Diff line change
@@ -1,35 +1,7 @@
From f6ba73eaede61841534623cdb01b69d793124f4b Mon Sep 17 00:00:00 2001
From: tro <[email protected]>
Date: Tue, 30 May 2023 12:02:24 +0200
Subject: [PATCH 1/2] Url.h: #include <cstdint>

Upstream-Status: Pending [https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136]

fix GCC 13 issue "'uint16_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? "
---
src/Url.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/Url.h b/src/Url.h
index 81fc932..fa084d3 100644
--- a/src/Url.h
+++ b/src/Url.h
@@ -3,6 +3,7 @@
#pragma once

#include <string>
+#include <cstdint>
namespace aws {
namespace iot {
namespace securedtunneling {
--
2.34.1


From de8779630d14e4f4969c9b171d826acfa847822b Mon Sep 17 00:00:00 2001
From cb510583d502c7b48c8ad6b3b7f175882cacb8eb Mon Sep 17 00:00:00 2001
From: tro <[email protected]>
Date: Tue, 30 May 2023 12:10:36 +0200
Subject: [PATCH 2/2] ProxySettings.h: add #include <cstdint>
Subject: [PATCH] ProxySettings.h: add #include <cstdint>

Upstream-Status: Pending -> https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136

Expand All @@ -49,6 +21,3 @@ index 9dc4e10..de3098a 100644
#include <boost/property_tree/ptree.hpp>
namespace aws { namespace iot { namespace securedtunneling { namespace settings {
using boost::property_tree::ptree;
--
2.34.1

34 changes: 34 additions & 0 deletions recipes-iot/aws-iot-securetunneling-localproxy/files/gcc13_2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

Upstream-Status: Pending -> https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136

Index: git/src/Url.cpp
===================================================================
--- git.orig/src/Url.cpp
+++ git/src/Url.cpp
@@ -5,6 +5,7 @@
#include <algorithm>
#include <cctype>
#include <functional>
+#include <cstdint>

#include <boost/log/core.hpp>
#include <boost/log/trivial.hpp>
@@ -106,4 +107,4 @@ string aws::iot::securedtunneling::url::
}
return out;
}
-}
\ No newline at end of file
+}
Index: git/src/Url.h
===================================================================
--- git.orig/src/Url.h
+++ git/src/Url.h
@@ -3,6 +3,7 @@
#pragma once

#include <string>
+#include <cstdint>
namespace aws {
namespace iot {
namespace securedtunneling {

0 comments on commit f99652d

Please sign in to comment.