diff mbox series

[oe,meta-oe,5/6] mongodb: Fix build with clang

Message ID 20190206004547.32351-5-raj.khem@gmail.com
State New
Headers show
Series [oe,meta-oe,1/6] catch2: Upgrade to 2.6.0 | expand

Commit Message

Khem Raj Feb. 6, 2019, 12:45 a.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...sio-Dont-use-experimental-with-clang.patch | 28 +++++++++++++++++++
 meta-oe/recipes-dbs/mongodb/mongodb_git.bb    |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch

-- 
2.20.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Vincent Prince May 3, 2019, 8:35 a.m. UTC | #1 
Hi Khem,

I can't compile mongodb in Warrior branch with g++ either,
it fails in boost::asio with std::basic_string_view with "-std=c++14"
cflags.
It seems C++17 support is only present in 4.1.x branch and not in r4.0.6?
Maybe we need to generalize this patch?

Regards,
Vincent

Le mer. 6 févr. 2019 à 01:47, Khem Raj <raj.khem@gmail.com> a écrit :

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...sio-Dont-use-experimental-with-clang.patch | 28 +++++++++++++++++++
>  meta-oe/recipes-dbs/mongodb/mongodb_git.bb    |  1 +
>  2 files changed, 29 insertions(+)
>  create mode 100644
> meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
>
> diff --git
> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
> new file mode 100644
> index 0000000000..b597422e40
> --- /dev/null
> +++
> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
> @@ -0,0 +1,28 @@
> +From 31ca5c563f1d9a3f70258be3dd2b1e547a65a550 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Tue, 5 Feb 2019 00:21:12 -0800
> +Subject: [PATCH] asio: Dont use experimental with clang
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + .../asio-master/asio/include/asio/detail/string_view.hpp      | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git
> a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
> b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
> +index 222c02186d..3bf7494529 100644
> +--- a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
> ++++ b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
> +@@ -28,8 +28,8 @@
> + namespace asio {
> +
> + #if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
> +-using std::experimental::basic_string_view;
> +-using std::experimental::string_view;
> ++using std::basic_string_view;
> ++using std::string_view;
> + #else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
> + using std::basic_string_view;
> + using std::string_view;
> +--
> +2.20.1
> +
> diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
> b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
> index 6494e25bf0..53a9f66117 100644
> --- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
> +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
> @@ -21,6 +21,7 @@ SRC_URI = "git://
> github.com/mongodb/mongo.git;branch=v4.0 \
>             file://arm64-support.patch \
>
> file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \
>             file://0001-Support-deprecated-resolver-functions.patch \
> +           file://0001-asio-Dont-use-experimental-with-clang.patch \
>             "
>  SRC_URI_append_libc-musl ="\
>             file://0002-Fix-default-stack-size-to-256K.patch \
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Vincent Prince May 6, 2019, 10:56 a.m. UTC | #2 
Removing this patch allow me to compile mongodb with gcc.
Maybe you need to append 0001-asio-Dont-use-experimental-with-clang.patch
only if clang is used?

Le ven. 3 mai 2019 à 10:35, Vincent Prince <vincent.prince.fr@gmail.com> a
écrit :

> Hi Khem,
>
> I can't compile mongodb in Warrior branch with g++ either,
> it fails in boost::asio with std::basic_string_view with "-std=c++14"
> cflags.
> It seems C++17 support is only present in 4.1.x branch and not in r4.0.6?
> Maybe we need to generalize this patch?
>
> Regards,
> Vincent
>
> Le mer. 6 févr. 2019 à 01:47, Khem Raj <raj.khem@gmail.com> a écrit :
>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  ...sio-Dont-use-experimental-with-clang.patch | 28 +++++++++++++++++++
>>  meta-oe/recipes-dbs/mongodb/mongodb_git.bb    |  1 +
>>  2 files changed, 29 insertions(+)
>>  create mode 100644
>> meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
>>
>> diff --git
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
>> new file mode 100644
>> index 0000000000..b597422e40
>> --- /dev/null
>> +++
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
>> @@ -0,0 +1,28 @@
>> +From 31ca5c563f1d9a3f70258be3dd2b1e547a65a550 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Tue, 5 Feb 2019 00:21:12 -0800
>> +Subject: [PATCH] asio: Dont use experimental with clang
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> + .../asio-master/asio/include/asio/detail/string_view.hpp      | 4 ++--
>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git
>> a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
>> b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
>> +index 222c02186d..3bf7494529 100644
>> +---
>> a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
>> ++++
>> b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
>> +@@ -28,8 +28,8 @@
>> + namespace asio {
>> +
>> + #if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
>> +-using std::experimental::basic_string_view;
>> +-using std::experimental::string_view;
>> ++using std::basic_string_view;
>> ++using std::string_view;
>> + #else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
>> + using std::basic_string_view;
>> + using std::string_view;
>> +--
>> +2.20.1
>> +
>> diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
>> b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
>> index 6494e25bf0..53a9f66117 100644
>> --- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
>> +++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
>> @@ -21,6 +21,7 @@ SRC_URI = "git://
>> github.com/mongodb/mongo.git;branch=v4.0 \
>>             file://arm64-support.patch \
>>
>> file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \
>>             file://0001-Support-deprecated-resolver-functions.patch \
>> +           file://0001-asio-Dont-use-experimental-with-clang.patch \
>>             "
>>  SRC_URI_append_libc-musl ="\
>>             file://0002-Fix-default-stack-size-to-256K.patch \
>> --
>> 2.20.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
new file mode 100644
index 0000000000..b597422e40
--- /dev/null
+++ b/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch
@@ -0,0 +1,28 @@ 
+From 31ca5c563f1d9a3f70258be3dd2b1e547a65a550 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 5 Feb 2019 00:21:12 -0800
+Subject: [PATCH] asio: Dont use experimental with clang
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../asio-master/asio/include/asio/detail/string_view.hpp      | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
+index 222c02186d..3bf7494529 100644
+--- a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
++++ b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp
+@@ -28,8 +28,8 @@
+ namespace asio {
+ 
+ #if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
+-using std::experimental::basic_string_view;
+-using std::experimental::string_view;
++using std::basic_string_view;
++using std::string_view;
+ #else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
+ using std::basic_string_view;
+ using std::string_view;
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
index 6494e25bf0..53a9f66117 100644
--- a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
@@ -21,6 +21,7 @@  SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.0 \
            file://arm64-support.patch \
            file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \
            file://0001-Support-deprecated-resolver-functions.patch \
+           file://0001-asio-Dont-use-experimental-with-clang.patch \
            "
 SRC_URI_append_libc-musl ="\
            file://0002-Fix-default-stack-size-to-256K.patch \