mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
From 9c2559434b752df3dc8460ee242d321670a40847 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 1 Jun 2020 11:41:54 +0200
|
||||
Subject: [PATCH] include/wampcc/platform.h: fix build with musl 1.2.0
|
||||
|
||||
Fix the following build failure on musl 1.2.0 due to time_t being on 64
|
||||
bits:
|
||||
|
||||
/home/naourr/work/instance-0/output-1/build/wampcc-1.6/libs/wampcc/utils.cc: In function 'std::__cxx11::string wampcc::local_timestamp()':
|
||||
/home/naourr/work/instance-0/output-1/build/wampcc-1.6/libs/wampcc/utils.cc:205:15: error: cannot convert 'wampcc::time_val::type_type*' {aka 'long int*'} to 'const time_t*' {aka 'const long long int*'}
|
||||
localtime_r(&now.sec, &parts);
|
||||
^~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/da996e189220499b85efbdb541a891ac18db38c6
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/darrenjs/wampcc/pull/62]
|
||||
---
|
||||
include/wampcc/platform.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/wampcc/platform.h b/include/wampcc/platform.h
|
||||
index 24d0868..aebf950 100644
|
||||
--- a/include/wampcc/platform.h
|
||||
+++ b/include/wampcc/platform.h
|
||||
@@ -27,7 +27,7 @@ namespace wampcc
|
||||
struct time_val
|
||||
{
|
||||
#ifndef _WIN32
|
||||
- typedef long type_type;
|
||||
+ typedef time_t type_type;
|
||||
#else
|
||||
typedef __time64_t type_type;
|
||||
#endif
|
||||
--
|
||||
2.26.2
|
||||
|
||||
27
package/wampcc/0003-Broken-build-on-Windows.patch
Normal file
27
package/wampcc/0003-Broken-build-on-Windows.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From eaa70a289288db1e8d90a2a9bcde435a8975fe74 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Lukashevich <sergey.lukashevi4@gmail.com>
|
||||
Date: Fri, 26 Jul 2019 21:58:34 +0300
|
||||
Subject: [PATCH] Broken build on Windows: "http_parser.h(66,18): error C2039:
|
||||
'runtime_error': is not a member of 'std'"
|
||||
|
||||
Add missing <stdexcept> include.
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/darrenjs/wampcc/commit/eaa70a289288db1e8d90a2a9bcde435a8975fe74]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
include/wampcc/http_parser.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/wampcc/http_parser.h b/include/wampcc/http_parser.h
|
||||
index a9405dd..4c20417 100644
|
||||
--- a/include/wampcc/http_parser.h
|
||||
+++ b/include/wampcc/http_parser.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <memory>
|
||||
+#include <stdexcept>
|
||||
|
||||
// types brought in from nodejs http-parser project
|
||||
struct http_parser;
|
||||
Reference in New Issue
Block a user