diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch new file mode 100644 index 000000000..925c085e9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch @@ -0,0 +1,69 @@ +Implement function as wrapper for std::make_unique +method to be compatible with gcc < 4.9 . +"error::make_unique is not a member of 'std'" + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> + +diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc +--- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100 ++++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100 +@@ -52,6 +52,16 @@ + # define AI_V4MAPPED 0 + #endif + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template<typename T, typename... Args> ++ std::unique_ptr<T> make_unique(Args&&... args) { ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace cares_wrap { + +diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc +--- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100 ++++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100 +@@ -24,6 +24,16 @@ + #include <pthread.h> + #endif // __POSIX__ + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template<typename T, typename... Args> ++ std::unique_ptr<T> make_unique(Args&&... args) { ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace inspector { + namespace { + +diff --git a/src/inspector/main_thread_interface.cc b/src/inspector/main_thread_interface.cc +index e374c0fd70..05d7d8c60f 100644 +--- a/src/inspector/main_thread_interface.cc ++++ b/src/inspector/main_thread_interface.cc +@@ -6,6 +6,16 @@ + #include <functional> + #include <unicode/unistr.h> + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template<typename T, typename... Args> ++ std::unique_ptr<T> make_unique(Args&&... args) { ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace inspector { + namespace { |