diff options
| author | Jihoon Jung <jh8801.jung@samsung.com> | 2023-07-05 11:44:56 +0900 |
|---|---|---|
| committer | Jihoon Jung <jh8801.jung@samsung.com> | 2023-07-05 11:45:43 +0900 |
| commit | 37544f38dedd2bc679968ec70da20357608b8504 (patch) | |
| tree | 796e0d3857465307e4eaf2ec368ac55880aa42b2 | |
| parent | ea40bede7348398a5be9ecdc9fe6f112b3a30509 (diff) | |
| download | iotivity-37544f38dedd2bc679968ec70da20357608b8504.tar.gz iotivity-37544f38dedd2bc679968ec70da20357608b8504.tar.bz2 iotivity-37544f38dedd2bc679968ec70da20357608b8504.zip | |
Fix Build error for riskv profileaccepted/tizen/unified/dev/20230726.115900accepted/tizen/unified/20231226.180234accepted/tizen/unified/20231226.154655
Change-Id: Ib8e551531b0e595a1ff59a4862f72a01f1bfbb55
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
| -rwxr-xr-x[-rw-r--r--] | build_common/external_libs.scons | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | build_common/tools/UnpackAll.py | 2 | ||||
| -rw-r--r-- | resource/include/OCApi.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build_common/external_libs.scons b/build_common/external_libs.scons index b9c6947d2..1f0c42f91 100644..100755 --- a/build_common/external_libs.scons +++ b/build_common/external_libs.scons @@ -21,7 +21,7 @@ # ## import os, subprocess -import urllib.request, urllib.error, urllib.parse, urllib.parse +import urllib, urlparse import SCons.Errors Import('env') @@ -104,7 +104,7 @@ def __download(ienv, target, url) : try : print(("Download %s from %s" % (target, url))) print("Downloading ...") - stream = urllib.request.urlopen(url) + stream = urllib.urlopen(url) file = open(target, 'wb') file.write(stream.read()) file.close() diff --git a/build_common/tools/UnpackAll.py b/build_common/tools/UnpackAll.py index 9788992d3..fd9099540 100644..100755 --- a/build_common/tools/UnpackAll.py +++ b/build_common/tools/UnpackAll.py @@ -99,7 +99,7 @@ import SCons.Util # enables Scons warning for this builder -class UnpackWarning(SCons.Warnings.SConsWarning) : +class UnpackWarning(SCons.Warnings.Warning) : pass SCons.Warnings.enableWarningClass(UnpackWarning) diff --git a/resource/include/OCApi.h b/resource/include/OCApi.h index da8a401b2..493012aec 100644 --- a/resource/include/OCApi.h +++ b/resource/include/OCApi.h @@ -59,7 +59,7 @@ namespace OC /* We'll want to provide some sort of explicit hook for custom logging at some point; until then, this should do nicely (note that since these are lambdas, later a special target could be captured, allowing much flexibility): */ - auto oclog_target = []() -> log_target_t& + inline auto oclog_target = []() -> log_target_t& { static OC::oc_log_stream ols(oc_make_ostream_logger); static log_target_t os(ols); @@ -68,7 +68,7 @@ namespace OC }; } // namespace OC::detail - auto oclog = []() -> boost::iostreams::stream<OC::oc_log_stream>& + inline auto oclog = []() -> boost::iostreams::stream<OC::oc_log_stream>& { return detail::oclog_target(); }; |