From 37544f38dedd2bc679968ec70da20357608b8504 Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Wed, 5 Jul 2023 11:44:56 +0900 Subject: [PATCH] Fix Build error for riskv profile Change-Id: Ib8e551531b0e595a1ff59a4862f72a01f1bfbb55 Signed-off-by: Jihoon Jung --- build_common/external_libs.scons | 4 ++-- build_common/tools/UnpackAll.py | 2 +- resource/include/OCApi.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 build_common/external_libs.scons mode change 100644 => 100755 build_common/tools/UnpackAll.py diff --git a/build_common/external_libs.scons b/build_common/external_libs.scons old mode 100644 new mode 100755 index b9c6947..1f0c42f --- 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 old mode 100644 new mode 100755 index 9788992..fd90995 --- 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 da8a401..493012a 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& + inline auto oclog = []() -> boost::iostreams::stream& { return detail::oclog_target(); }; -- 2.7.4