All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18
@ 2018-06-13  6:35 Khem Raj
  2018-06-13  6:35 ` [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name() Khem Raj
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Khem Raj @ 2018-06-13  6:35 UTC (permalink / raw)
  To: openembedded-devel

Fix build with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...Remove-man-files-which-cant-be-built.patch | 103 ++++++++++++++++++
 ...IFSOCK-is-defined-in-both-glibc-musl.patch |  29 +++++
 ...ude-endian.h-for-htole32-and-friends.patch |  25 +++++
 ...Remove-unused-include-for-execinfo.h.patch |  27 +++++
 ...igh.c-Do-not-include-net-if_packet.h.patch |  26 +++++
 .../{rdma-core_17.bb => rdma-core_18.1.bb}    |  10 +-
 6 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch
 create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
 create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch
 create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch
 create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch
 rename meta-networking/recipes-support/rdma-core/{rdma-core_17.bb => rdma-core_18.1.bb} (57%)

diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch
new file mode 100644
index 0000000000..4b595613fa
--- /dev/null
+++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch
@@ -0,0 +1,103 @@
+From 5a8a2f81ef8650f06d1d9d268add612ab46025f1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 Jun 2018 22:57:04 -0700
+Subject: [PATCH] Remove man files which cant be built
+
+Remove need for pandoc-prebuilt during cross build
+
+Fixes errors
+
+| CMake Error at libibumad/man/cmake_install.cmake:105 (file):
+|   file INSTALL cannot find
+|   "/mnt/a/oe/build/tmp/work/core2-64-bec-linux-musl/rdma-core/18.1-r0/git/buildlib/pandoc-prebuilt/41bbb0bed7a781be59e8c0dcd8b7278af2ce6882".
+| Call Stack (most recent call first):
+|   cmake_install.cmake:48 (include)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libibumad/man/CMakeLists.txt      |  1 -
+ libibverbs/man/CMakeLists.txt     | 15 ---------------
+ providers/mlx5/man/CMakeLists.txt |  1 -
+ 3 files changed, 17 deletions(-)
+
+diff --git a/libibumad/man/CMakeLists.txt b/libibumad/man/CMakeLists.txt
+index 185584a0..ac45a4e9 100644
+--- a/libibumad/man/CMakeLists.txt
++++ b/libibumad/man/CMakeLists.txt
+@@ -15,7 +15,6 @@ rdma_man_pages(
+   umad_get_mad_addr.3
+   umad_get_pkey.3
+   umad_get_port.3
+-  umad_init.3.md
+   umad_open_port.3
+   umad_poll.3
+   umad_recv.3
+diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt
+index 86dd49de..b54675be 100644
+--- a/libibverbs/man/CMakeLists.txt
++++ b/libibverbs/man/CMakeLists.txt
+@@ -5,7 +5,6 @@ rdma_man_pages(
+   ibv_alloc_pd.3
+   ibv_alloc_td.3
+   ibv_asyncwatch.1
+-  ibv_attach_mcast.3.md
+   ibv_bind_mw.3
+   ibv_create_ah.3
+   ibv_create_ah_from_wc.3
+@@ -14,7 +13,6 @@ rdma_man_pages(
+   ibv_create_cq_ex.3
+   ibv_modify_cq.3
+   ibv_create_flow.3
+-  ibv_create_flow_action.3.md
+   ibv_create_qp.3
+   ibv_create_qp_ex.3
+   ibv_create_rwq_ind_table.3
+@@ -23,15 +21,9 @@ rdma_man_pages(
+   ibv_create_wq.3
+   ibv_devices.1
+   ibv_devinfo.1
+-  ibv_event_type_str.3.md
+-  ibv_fork_init.3.md
+   ibv_get_async_event.3
+   ibv_get_cq_event.3
+-  ibv_get_device_guid.3.md
+   ibv_get_device_list.3
+-  ibv_get_device_name.3.md
+-  ibv_get_srq_num.3.md
+-  ibv_inc_rkey.3.md
+   ibv_modify_qp.3
+   ibv_modify_qp_rate_limit.3
+   ibv_modify_srq.3
+@@ -46,19 +38,12 @@ rdma_man_pages(
+   ibv_post_srq_recv.3
+   ibv_query_device.3
+   ibv_query_device_ex.3
+-  ibv_query_gid.3.md
+-  ibv_query_pkey.3.md
+   ibv_query_port.3
+   ibv_query_qp.3
+   ibv_query_rt_values_ex.3
+   ibv_query_srq.3
+-  ibv_rate_to_mbps.3.md
+-  ibv_rate_to_mult.3.md
+   ibv_rc_pingpong.1
+   ibv_reg_mr.3
+-  ibv_req_notify_cq.3.md
+-  ibv_rereg_mr.3.md
+-  ibv_resize_cq.3.md
+   ibv_srq_pingpong.1
+   ibv_uc_pingpong.1
+   ibv_ud_pingpong.1
+diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt
+index cdc7115e..876b6fcf 100644
+--- a/providers/mlx5/man/CMakeLists.txt
++++ b/providers/mlx5/man/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ rdma_man_pages(
+-  mlx5dv_flow_action_esp.3.md
+   mlx5dv_get_clock_info.3
+   mlx5dv_init_obj.3
+   mlx5dv_query_device.3
+-- 
+2.17.1
+
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
new file mode 100644
index 0000000000..b04c9b7230
--- /dev/null
+++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch
@@ -0,0 +1,29 @@
+From f2df1db11f3a9580774300e703b6f53dbcdb28ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Jun 2018 20:17:57 -0700
+Subject: [PATCH] S_IFSOCK is defined in both glibc/musl
+
+Fixes
+
+preload.c:1183:46: error: '__S_IFSOCK' undeclared (first use in this function); did you mean 'S_IFSOCK'?
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ librdmacm/preload.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/librdmacm/preload.c b/librdmacm/preload.c
+index 0f2aa250..d46beb1b 100644
+--- a/librdmacm/preload.c
++++ b/librdmacm/preload.c
+@@ -1180,7 +1180,7 @@ int __fxstat(int ver, int socket, struct stat *buf)
+ 	if (fd_get(socket, &fd) == fd_rsocket) {
+ 		ret = real.fxstat(ver, socket, buf);
+ 		if (!ret)
+-			buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
++			buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK;
+ 	} else {
+ 		ret = real.fxstat(ver, fd, buf);
+ 	}
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch
new file mode 100644
index 0000000000..aa335244b6
--- /dev/null
+++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-include-endian.h-for-htole32-and-friends.patch
@@ -0,0 +1,25 @@
+From 65b9a47c07be4611b4fbbcafff1993186bcb0537 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 Jun 2018 19:15:52 -0700
+Subject: [PATCH 1/2] include endian.h for htole32 and friends
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ providers/hns/hns_roce_u.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h
+index bd66c6e7..b07424db 100644
+--- a/providers/hns/hns_roce_u.h
++++ b/providers/hns/hns_roce_u.h
+@@ -34,6 +34,7 @@
+ #define _HNS_ROCE_U_H
+ 
+ #include <stddef.h>
++#include <endian.h>
+ #include <util/compiler.h>
+ 
+ #include <infiniband/driver.h>
+-- 
+2.17.1
+
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch
new file mode 100644
index 0000000000..347f964e94
--- /dev/null
+++ b/meta-networking/recipes-support/rdma-core/rdma-core/0002-Remove-unused-include-for-execinfo.h.patch
@@ -0,0 +1,27 @@
+From 3d9cae15c69c0b3260a024ad5d6802a8d85515a2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 Jun 2018 19:18:24 -0700
+Subject: [PATCH 2/2] Remove unused include for execinfo.h
+
+Fixes build on musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ providers/qedr/qelr_verbs.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/providers/qedr/qelr_verbs.c b/providers/qedr/qelr_verbs.c
+index e3b01f28..2ee1c832 100644
+--- a/providers/qedr/qelr_verbs.c
++++ b/providers/qedr/qelr_verbs.c
+@@ -54,7 +54,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <execinfo.h>
+ 
+ #define QELR_SQE_ELEMENT_SIZE	(sizeof(struct rdma_sq_sge))
+ #define QELR_RQE_ELEMENT_SIZE	(sizeof(struct rdma_rq_sge))
+-- 
+2.17.1
+
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch
new file mode 100644
index 0000000000..e887f222b0
--- /dev/null
+++ b/meta-networking/recipes-support/rdma-core/rdma-core/0002-neigh.c-Do-not-include-net-if_packet.h.patch
@@ -0,0 +1,26 @@
+From 82486f7e1ee2aa07a5c12cb357834993aa8c1d20 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Jun 2018 20:19:13 -0700
+Subject: [PATCH] neigh.c: Do not include net/if_packet.h
+
+This header is glibc specific
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libibverbs/neigh.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libibverbs/neigh.c b/libibverbs/neigh.c
+index 21177db0..cfc593a0 100644
+--- a/libibverbs/neigh.c
++++ b/libibverbs/neigh.c
+@@ -2,7 +2,6 @@
+  */
+ 
+ #include "config.h"
+-#include <net/if_packet.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+ #include <endian.h>
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_17.bb b/meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb
similarity index 57%
rename from meta-networking/recipes-support/rdma-core/rdma-core_17.bb
rename to meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb
index 5d0329919f..6ad864d1e8 100644
--- a/meta-networking/recipes-support/rdma-core/rdma-core_17.bb
+++ b/meta-networking/recipes-support/rdma-core/rdma-core_18.1.bb
@@ -5,8 +5,14 @@ SECTION = "libs"
 DEPENDS = "libnl"
 RDEPENDS_${PN} = "bash perl"
 
-SRC_URI = "git://github.com/linux-rdma/rdma-core.git;protocol=http"
-SRCREV ="5ce12bd51ebb0a4db35dea382b1ebdc701bab224"
+SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=stable-v18 \
+           file://0001-S_IFSOCK-is-defined-in-both-glibc-musl.patch \
+           file://0002-neigh.c-Do-not-include-net-if_packet.h.patch \
+           file://0001-include-endian.h-for-htole32-and-friends.patch \
+           file://0002-Remove-unused-include-for-execinfo.h.patch \
+           file://0001-Remove-man-files-which-cant-be-built.patch \
+           "
+SRCREV = "7844b3fbe5120623d63b29ecb43eb83a61129658"
 S = "${WORKDIR}/git"
 
 #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name()
  2018-06-13  6:35 [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18 Khem Raj
@ 2018-06-13  6:35 ` Khem Raj
  2018-06-13  8:18   ` Andreas Müller
  2018-06-13  6:35 ` [meta-networking][PATCH V2 3/5] celt051: Fix building testcases Khem Raj
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2018-06-13  6:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...eck-for-canonicalize_file_name-befor.patch | 64 +++++++++++++++++++
 .../modemmanager/modemmanager_1.7.991.bb      |  4 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch

diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
new file mode 100644
index 0000000000..256dd2ce0b
--- /dev/null
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
@@ -0,0 +1,64 @@
+From 07f1eda630517816bfa900e811963745a149e57c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Jun 2018 20:38:30 -0700
+Subject: [PATCH] Add configure check for canonicalize_file_name() before use
+
+Define canonicalize_file_name API if not provided by system C library
+musl e.g. does not provide this API
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac                                |  2 ++
+ src/kerneldevice/mm-kernel-device-generic.c | 18 ++++++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+Index: ModemManager-1.7.991/configure.ac
+===================================================================
+--- ModemManager-1.7.991.orig/configure.ac
++++ ModemManager-1.7.991/configure.ac
+@@ -72,6 +72,8 @@ AC_SUBST(MM_GLIB_LT_CURRENT)
+ AC_SUBST(MM_GLIB_LT_REVISION)
+ AC_SUBST(MM_GLIB_LT_AGE)
+ 
++AC_CHECK_FUNCS([canonicalize_file_name])
++
+ dnl-----------------------------------------------------------------------------
+ dnl Documentation
+ dnl
+Index: ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c
+===================================================================
+--- ModemManager-1.7.991.orig/src/kerneldevice/mm-kernel-device-generic.c
++++ ModemManager-1.7.991/src/kerneldevice/mm-kernel-device-generic.c
+@@ -21,6 +21,7 @@
+ #define _LIBMM_INSIDE_MM
+ #include <libmm-glib.h>
+ 
++#include "config.h"
+ #include "mm-kernel-device-generic.h"
+ #include "mm-kernel-device-generic-rules.h"
+ #include "mm-log.h"
+@@ -100,6 +101,24 @@ read_sysfs_property_as_string (const gch
+     return contents;
+ }
+ 
++#ifndef HAVE_CANONICALIZE_FILE_NAME
++#include <limits.h>
++#include <string.h>
++#include <stdlib.h>
++#include <stdio.h>
++static char * canonicalize_file_name(const char *path)
++{
++   char buf[PATH_MAX] = { };
++
++   snprintf(buf, sizeof(buf) - 1, "%s", path);
++
++   if (!realpath(path, buf))
++       return NULL;
++
++   return strdup(buf);
++}
++#endif
++
+ /*****************************************************************************/
+ /* Load contents */
+ 
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
index b1a718dbfb..26b56d17d0 100644
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.7.991.bb
@@ -11,7 +11,9 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion
 
 DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native"
 
-SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \
+           file://0001-Add-configure-check-for-canonicalize_file_name-befor.patch \
+           "
 
 SRC_URI[md5sum] = "4efe6a240cef212bf8855c95424e7c7f"
 SRC_URI[sha256sum] = "4e366243bd4983f2e6efe35cb901cf5da51939307b5d6299fe622a9fcf411745"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [meta-networking][PATCH V2 3/5] celt051: Fix building testcases
  2018-06-13  6:35 [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18 Khem Raj
  2018-06-13  6:35 ` [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name() Khem Raj
@ 2018-06-13  6:35 ` Khem Raj
  2018-06-13  6:35 ` [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8 Khem Raj
  2018-06-13  6:35 ` [meta-networking][PATCH V2 5/5] wireshark: Update to 2.6 release Khem Raj
  3 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2018-06-13  6:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...tcode.c-into-test-sources-to-provide.patch | 55 +++++++++++++++++++
 .../recipes-support/celt051/celt051_git.bb    |  5 +-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch

diff --git a/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch b/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch
new file mode 100644
index 0000000000..cc893f0999
--- /dev/null
+++ b/meta-networking/recipes-support/celt051/celt051/0001-tests-Include-entcode.c-into-test-sources-to-provide.patch
@@ -0,0 +1,55 @@
+From 61fbdddb660c5944ac23b820754a7c4cf4eee097 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Jun 2018 19:29:03 -0700
+Subject: [PATCH] tests: Include entcode.c into test sources to provide
+ definitions of functions e.g. ec_ilog()
+
+Fixes link errors in tests
+| /usr/src/debug/celt051/0.5.1.3+gitAUTOINC+5555aae843-r0/git/tests/../libcelt/rangedec.c:202: undefined reference to `ec_ilog'
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests/cwrs32-test.c  | 1 +
+ tests/ectest.c       | 2 +-
+ tests/laplace-test.c | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/cwrs32-test.c b/tests/cwrs32-test.c
+index 3a95df2..a159ab3 100644
+--- a/tests/cwrs32-test.c
++++ b/tests/cwrs32-test.c
+@@ -8,6 +8,7 @@
+ #include "rangeenc.c"
+ #include "rangedec.c"
+ #include "cwrs.c"
++#include "entcode.c"
+ #include <string.h>
+ #define NMAX (10)
+ #define MMAX (9)
+diff --git a/tests/ectest.c b/tests/ectest.c
+index aa35453..94eb9a3 100644
+--- a/tests/ectest.c
++++ b/tests/ectest.c
+@@ -5,7 +5,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+-#include "entcode.h"
++#include "entcode.c"
+ #include "entenc.c"
+ #include "entdec.c"
+ #include "rangeenc.c"
+diff --git a/tests/laplace-test.c b/tests/laplace-test.c
+index 3f98ab3..8e1fb4e 100644
+--- a/tests/laplace-test.c
++++ b/tests/laplace-test.c
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include "laplace.c"
+ #include "stack_alloc.h"
++#include "entcode.c"
+ #include "entenc.c"
+ #include "entdec.c"
+ #include "rangeenc.c"
diff --git a/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-networking/recipes-support/celt051/celt051_git.bb
index 850704f5af..116800522a 100644
--- a/meta-networking/recipes-support/celt051/celt051_git.bb
+++ b/meta-networking/recipes-support/celt051/celt051_git.bb
@@ -17,8 +17,9 @@ PV = "0.5.1.3+git${SRCPV}"
 SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f"
 
 SRC_URI = "git://git.xiph.org/celt.git;branch=compat-v0.5.1;protocol=https \
-    file://0001-configure.ac-make-tools-support-optional.patch \
-"
+           file://0001-configure.ac-make-tools-support-optional.patch \
+           file://0001-tests-Include-entcode.c-into-test-sources-to-provide.patch \
+           "
 
 S = "${WORKDIR}/git"
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8
  2018-06-13  6:35 [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18 Khem Raj
  2018-06-13  6:35 ` [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name() Khem Raj
  2018-06-13  6:35 ` [meta-networking][PATCH V2 3/5] celt051: Fix building testcases Khem Raj
@ 2018-06-13  6:35 ` Khem Raj
  2018-06-17  7:34   ` Martin Jansa
  2018-06-13  6:35 ` [meta-networking][PATCH V2 5/5] wireshark: Update to 2.6 release Khem Raj
  3 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2018-06-13  6:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-disable-more-Werror-warnings.patch   | 48 +++++++++++++++++++
 .../recipes-support/cpprest/cpprest_2.10.2.bb |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch

diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
new file mode 100644
index 0000000000..febfd5bc96
--- /dev/null
+++ b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
@@ -0,0 +1,48 @@
+From ee92f84a96a507b0a7a3c54929ce190ee28b4ecd Mon Sep 17 00:00:00 2001
+From: Alexander Moriarty <amoriarty@fetchrobotics.com>
+Date: Wed, 6 Jun 2018 10:38:43 -0700
+Subject: [PATCH] disable more -Werror warnings
+
+gcc-8: -Wno-format-truncation
+
+clang-6: -Wdelete-non-virtual-dtor
+clang-6: -Wunused-lambda-capture
+
+removed duplicated: -Wno-reorder
+
+This fixes #778
+
+Upstream-Status: Pending [https://github.com/Microsoft/cpprestsdk/pull/779]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Release/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
+index 1267aff1..fb291ccd 100644
+--- a/Release/CMakeLists.txt
++++ b/Release/CMakeLists.txt
+@@ -166,12 +166,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith")
+   elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
+-    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs)
++    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture)
+     set(WARNINGS ${WARNINGS} ${LINUX_SUPPRESSIONS})
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
+   else()
+     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
+-    set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs)
++    set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture)
+     set(WARNINGS ${WARNINGS} ${OSX_SUPPRESSIONS})
+ 
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
+@@ -184,7 +184,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+   message("-- Setting gcc options")
+ 
+-  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code)
++  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code -Wno-format-truncation)
+   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
+ 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
index 1dbe093bee..fea5d4b2eb 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
@@ -9,6 +9,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
            file://fix-cmake-install.patch \
            file://0001-Fix-a-build-problem-on-Clang.patch;patchdir=.. \
            file://0002-Define-virtual-destructor.patch;patchdir=.. \
+           file://0001-disable-more-Werror-warnings.patch;patchdir=.. \
            "
 
 # tag 2.10.2
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [meta-networking][PATCH V2 5/5] wireshark: Update to 2.6 release
  2018-06-13  6:35 [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18 Khem Raj
                   ` (2 preceding siblings ...)
  2018-06-13  6:35 ` [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8 Khem Raj
@ 2018-06-13  6:35 ` Khem Raj
  3 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2018-06-13  6:35 UTC (permalink / raw)
  To: openembedded-devel

Add a native version to provide certain utilities needed during cross build
Strip rpaths which cmake seems to be enforcing for no reason

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../wireshark/files/libgcrypt.patch           | 53 ------------
 .../0001-Add-libm-to-link-for-fmod-API.patch  | 29 +++++++
 .../wireshark/wireshark_2.4.6.bb              | 73 -----------------
 .../wireshark/wireshark_2.6.1.bb              | 80 +++++++++++++++++++
 4 files changed, 109 insertions(+), 126 deletions(-)
 delete mode 100644 meta-networking/recipes-support/wireshark/files/libgcrypt.patch
 create mode 100644 meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch
 delete mode 100644 meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb
 create mode 100644 meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb

diff --git a/meta-networking/recipes-support/wireshark/files/libgcrypt.patch b/meta-networking/recipes-support/wireshark/files/libgcrypt.patch
deleted file mode 100644
index 2aa58f73c2..0000000000
--- a/meta-networking/recipes-support/wireshark/files/libgcrypt.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-use OR PKG_CONFIG scheme for libgcrypt
-
-Upstream-Status: Inappropriate OE specific
-
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
-Index: wireshark-2.4.4/m4/libgcrypt.m4
-===================================================================
---- wireshark-2.4.4.orig/m4/libgcrypt.m4
-+++ wireshark-2.4.4/m4/libgcrypt.m4
-@@ -27,11 +27,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
-   if test x$libgcrypt_config_prefix != x ; then
-      if test x${LIBGCRYPT_CONFIG+set} != xset ; then
--        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
-+        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/libgcrypt.pc
-      fi
-   fi
- 
--  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
-+  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt.pc, no)
-   tmp=ifelse([$1], ,1:1.2.0,$1)
-   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-      req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-@@ -50,7 +50,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-     req_micro=`echo $min_libgcrypt_version | \
-                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
--    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
-+    libgcrypt_config_version=`$PKG_CONFIG --modversion libgcrypt`
-     major=`echo $libgcrypt_config_version | \
-                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-     minor=`echo $libgcrypt_config_version | \
-@@ -82,7 +82,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-      # If we have a recent libgcrypt, we should also check that the
-      # API is compatible
-      if test "$req_libgcrypt_api" -gt 0 ; then
--        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
-+        tmp=`$PKG_CONFIG --api-version libgcrypt 2>/dev/null || echo 0`
-         if test "$tmp" -gt 0 ; then
-            AC_MSG_CHECKING([LIBGCRYPT API version])
-            if test "$req_libgcrypt_api" -eq "$tmp" ; then
-@@ -95,8 +95,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-      fi
-   fi
-   if test $ok = yes; then
--    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
--    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-+    LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt`
-+    LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt`
-     ifelse([$2], , :, [$2])
-   else
-     LIBGCRYPT_CFLAGS=""
diff --git a/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch b/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch
new file mode 100644
index 0000000000..e65ef9b10c
--- /dev/null
+++ b/meta-networking/recipes-support/wireshark/wireshark/0001-Add-libm-to-link-for-fmod-API.patch
@@ -0,0 +1,29 @@
+From 1a6a5d2bcb1adec9ba138c2ebee7bbc994620aff Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 Jun 2018 23:23:44 -0700
+Subject: [PATCH] Add libm to link for fmod() API
+
+fixes
+ld: CMakeFiles/tshark.dir/ui/cli/tap-comparestat.c.o: undefined reference to symbol 'fmod@@GLIBC_2.2.5'
+| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/wireshark/1_2.6.1-r0/recipe-sysroot/lib/libm.so.6: error adding symbols: DSO missing from command line
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7950e85..acee140 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2494,6 +2494,7 @@ if(BUILD_tshark)
+ 		${LIBEPAN_LIBS}
+ 		${APPLE_CORE_FOUNDATION_LIBRARY}
+ 		${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
++		m
+ 	)
+ 	set(tshark_FILES
+ 		capture_opts.c
+-- 
+2.17.1
+
diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb b/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb
deleted file mode 100644
index 3da0a7bafc..0000000000
--- a/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb
+++ /dev/null
@@ -1,73 +0,0 @@
-DESCRIPTION = "wireshark - a popular network protocol analyzer"
-HOMEPAGE = "http://www.wireshark.org"
-SECTION = "net"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77"
-
-DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error"
-
-SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz"
-SRC_URI += "file://libgcrypt.patch"
-
-UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
-
-SRC_URI[md5sum] = "8cfb73e286dd6427ca4405e6e802d13e"
-SRC_URI[sha256sum] = "8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe"
-
-PE = "1"
-
-inherit autotools pkgconfig perlnative upstream-version-is-even
-
-ARM_INSTRUCTION_SET = "arm"
-
-PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
-PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}"
-
-PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}/usr, --with-libcap=no --enable-pcap-ng-default , libcap"
-PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_DIR_HOST}/usr --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default  , libpcap"
-PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi"
-PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl"
-PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19"
-PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+"
-PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3"
-PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark,"
-PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
-PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl"
-PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
-PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua"
-PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib"
-PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip"
-PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no"
-PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc"
-PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_DIR_HOST}/usr, --with-libssh=no, libssh2"
-PACKAGECONFIG[lz4] = "--with-lz4=${STAGING_DIR_HOST}/usr, --with-lz4=no, lz4"
-
-# these next two options require addional layers
-PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares"
-
-EXTRA_OECONF += "--with-libgcrypt-prefix=${PKG_CONFIG_DIR} --with-qt=no --enable-tshark --enable-rawshark"
-
-LDFLAGS_append = " -lgpg-error"
-
-# Currently wireshark does not install header files
-do_install_append () {
-
-	install -d ${D}/${includedir}/${BPN}
-	install -d ${D}/${includedir}/${BPN}/epan
-	install -d ${D}/${includedir}/${BPN}/epan/crypt
-	install -d ${D}/${includedir}/${BPN}/epan/dfilter
-	install -d ${D}/${includedir}/${BPN}/epan/dissectors
-	install -d ${D}/${includedir}/${BPN}/epan/ftypes
-	install -d ${D}/${includedir}/${BPN}/epan/wmem
-
-	install config.h ${D}/${includedir}/${BPN}
-	install ${S}/register.h ${D}/${includedir}/${BPN}
-	install -D ${S}/epan/*.h ${D}/${includedir}/${BPN}/epan
-	install -D ${S}/epan/crypt/*.h ${D}/${includedir}/${BPN}/epan/crypt
-	install -D ${S}/epan/dfilter/*.h ${D}/${includedir}/${BPN}/epan/dfilter
-	install -D ${S}/epan/dissectors/*.h ${D}/${includedir}/${BPN}/epan/dissectors
-	install -D ${S}/epan/ftypes/*.h ${D}/${includedir}/${BPN}/epan/ftypes
-	install -D ${S}/epan/wmem/*.h ${D}/${includedir}/${BPN}/epan/wmem
-}
-
-FILES_${PN} += "${datadir}*"
diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
new file mode 100644
index 0000000000..91c5e96bb0
--- /dev/null
+++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
@@ -0,0 +1,80 @@
+DESCRIPTION = "wireshark - a popular network protocol analyzer"
+HOMEPAGE = "http://www.wireshark.org"
+SECTION = "net"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77"
+
+DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2"
+
+DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native "
+
+SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz \
+           file://0001-Add-libm-to-link-for-fmod-API.patch \
+          "
+
+UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
+
+SRC_URI[md5sum] = "b0e9e5fe22e96d9fdfad18f750fa8f55"
+SRC_URI[sha256sum] = "ab6e5bbc3464c956347b8671ce8397950ad5daff3bf9964c967d495f4ddbcd88"
+
+PE = "1"
+
+inherit cmake pkgconfig pythonnative perlnative upstream-version-is-even
+
+ARM_INSTRUCTION_SET = "arm"
+
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
+PACKAGECONFIG_append_class-target = " ${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk3 graphics ", "", d)}"
+
+PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
+
+PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap"
+PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap"
+PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi"
+PACKAGECONFIG[libnl] = ",,libnl"
+PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19"
+PACKAGECONFIG[gtk2] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF, gtk+"
+PACKAGECONFIG[gtk3] = "-DENABLE_GTK3=ON,-DENABLE_GTK3=OFF, gtk+3"
+PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qtbase"
+PACKAGECONFIG[graphics] = ",-DENABLE_GTK=OFF,"
+PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls"
+PACKAGECONFIG[ssl] = ",,openssl"
+PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5"
+PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua"
+PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib"
+PACKAGECONFIG[geoip] = ",, geoip"
+PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF"
+PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc"
+PACKAGECONFIG[libssh] = ",,libssh2"
+PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4"
+
+# these next two options require addional layers
+PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares"
+
+EXTRA_OECMAKE += "-DBUILD_wireshark=ON \
+                  -DENABLE_NETLINK=ON \
+                  -DBUILD_mmdbresolve=OFF \
+                  -DBUILD_randpktdump=OFF \
+                  -DBUILD_androiddump=OFF \
+                  -DBUILD_dcerpcidl2wrs=OFF \
+                  -DM_INCLUDE_DIR=${includedir} \
+                  -DM_LIBRARY=${libdir} \
+                 "
+do_install_append_class-native() {
+	install -d ${D}${bindir}
+	for f in make-dissectors lemon make-taps
+	do
+		install -m 0755 ${B}/run/$f ${D}${bindir}
+	done
+}
+
+do_install_append_class-target() {
+	for f in `find ${D}${libdir} ${D}${bindir} -type f -executable`
+	do
+		chrpath --delete $f
+	done
+}
+
+FILES_${PN} += "${datadir}*"
+
+BBCLASSEXTEND = "native"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name()
  2018-06-13  6:35 ` [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name() Khem Raj
@ 2018-06-13  8:18   ` Andreas Müller
  2018-06-13 13:45     ` Khem Raj
  0 siblings, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2018-06-13  8:18 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

On Wed, Jun 13, 2018 at 8:35 AM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...eck-for-canonicalize_file_name-befor.patch | 64 +++++++++++++++++++
>  .../modemmanager/modemmanager_1.7.991.bb      |  4 +-
>  2 files changed, 67 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
>
> diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
> new file mode 100644
> index 0000000000..256dd2ce0b
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
> @@ -0,0 +1,64 @@
> +From 07f1eda630517816bfa900e811963745a149e57c Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Fri, 8 Jun 2018 20:38:30 -0700
> +Subject: [PATCH] Add configure check for canonicalize_file_name() before use
> +
> +Define canonicalize_file_name API if not provided by system C library
> +musl e.g. does not provide this API
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
^ Don't know what the current status: Do we still insist on Upstream-Status?

Why I ask: This solution might have the chance upstream.

Andreas


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name()
  2018-06-13  8:18   ` Andreas Müller
@ 2018-06-13 13:45     ` Khem Raj
  0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2018-06-13 13:45 UTC (permalink / raw)
  To: Andreas Müller; +Cc: openembeded-devel

Hi Andreas

On 6/13/18 1:18 AM, Andreas Müller wrote:
> On Wed, Jun 13, 2018 at 8:35 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>   ...eck-for-canonicalize_file_name-befor.patch | 64 +++++++++++++++++++
>>   .../modemmanager/modemmanager_1.7.991.bb      |  4 +-
>>   2 files changed, 67 insertions(+), 1 deletion(-)
>>   create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
>>
>> diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
>> new file mode 100644
>> index 0000000000..256dd2ce0b
>> --- /dev/null
>> +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Add-configure-check-for-canonicalize_file_name-befor.patch
>> @@ -0,0 +1,64 @@
>> +From 07f1eda630517816bfa900e811963745a149e57c Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Fri, 8 Jun 2018 20:38:30 -0700
>> +Subject: [PATCH] Add configure check for canonicalize_file_name() before use
>> +
>> +Define canonicalize_file_name API if not provided by system C library
>> +musl e.g. does not provide this API
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ^ Don't know what the current status: Do we still insist on Upstream-Status?
> 
> Why I ask: This solution might have the chance upstream.
> 

Yes I will add Upstream-Status: Pending

> Andreas
> 


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8
  2018-06-13  6:35 ` [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8 Khem Raj
@ 2018-06-17  7:34   ` Martin Jansa
  2018-06-17  7:38     ` Khem Raj
  0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2018-06-17  7:34 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-devel

I think you're missing '=' in -Wno-format-truncation (it's shown in the
error message, so I was always adding it with '=' as well, but it seems
that both work).

cpprest/2.10.2-r0/git/Release/src/utilities/asyncrt_utils.cpp:702:42:
error: '%s' directive output may be truncated writing up to 8 bytes into a
region of size between 1 and 65 [-Werror=format-truncation=]
         snprintf(output, sizeof(output), "%s%sZ", datetime_str, buf);
                                          ^~~~~~~                ~~~
cpprest/2.10.2-r0/git/Release/src/utilities/asyncrt_utils.cpp:702:17: note:
'snprintf' output between 2 and 74 bytes into a destination of size 65
         snprintf(output, sizeof(output), "%s%sZ", datetime_str, buf);
         ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Also can you please drop one of these? The one in meta-networking is still
failing

./meta-oe/recipes-support/cpprest
./meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
./meta-oe/recipes-support/cpprest/cpprest-2.10.2
./meta-networking/recipes-support/cpprest
./meta-networking/recipes-support/cpprest/cpprest_2.10.2.bb
./meta-networking/recipes-support/cpprest/cpprest-2.10.2

Added in:
meta-oe:
commit 9eb8b9a2c416da018c4a8acb416ef38797436f50
Author:     Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
AuthorDate: Thu Apr 19 19:12:07 2018 +0200
Commit:     Armin Kuster <akuster808@gmail.com>
CommitDate: Tue May 1 18:17:02 2018 -0700

    cpprest: add new recipe based on Debian packaging

    Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
    Signed-off-by: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com
>
    Co-developed-by: Cristiano Prato <cristiano.prato@cnhind.com>
    Signed-off-by: Armin Kuster <akuster808@gmail.com>

meta-networking:
commit 12e8c3ea698905e2ed0edd9b7f351a497a1bd68d
Author:     Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
AuthorDate: Sun Apr 29 20:02:06 2018 +0200
Commit:     Armin Kuster <akuster808@gmail.com>
CommitDate: Thu May 17 08:32:26 2018 -0700

    cpprest: add new recipe based on Debian packaging

    The patches were imported from the Debian repository
    (https://salsa.debian.org/debian/casablanca) as of commit id
5b58637016a569a5d54714bd151a800028f77532

    Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
    Signed-off-by: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com
>
    Co-developed-by: Cristiano Prato <cristiano.prato@cnhind.com>
    Signed-off-by: Armin Kuster <akuster808@gmail.com>


On Wed, Jun 13, 2018 at 9:01 AM Khem Raj <raj.khem@gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../0001-disable-more-Werror-warnings.patch   | 48 +++++++++++++++++++
>  .../recipes-support/cpprest/cpprest_2.10.2.bb |  1 +
>  2 files changed, 49 insertions(+)
>  create mode 100644
> meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
>
> diff --git
> a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
> b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
> new file mode 100644
> index 0000000000..febfd5bc96
> --- /dev/null
> +++
> b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
> @@ -0,0 +1,48 @@
> +From ee92f84a96a507b0a7a3c54929ce190ee28b4ecd Mon Sep 17 00:00:00 2001
> +From: Alexander Moriarty <amoriarty@fetchrobotics.com>
> +Date: Wed, 6 Jun 2018 10:38:43 -0700
> +Subject: [PATCH] disable more -Werror warnings
> +
> +gcc-8: -Wno-format-truncation
> +
> +clang-6: -Wdelete-non-virtual-dtor
> +clang-6: -Wunused-lambda-capture
> +
> +removed duplicated: -Wno-reorder
> +
> +This fixes #778
> +
> +Upstream-Status: Pending [
> https://github.com/Microsoft/cpprestsdk/pull/779]
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + Release/CMakeLists.txt | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
> +index 1267aff1..fb291ccd 100644
> +--- a/Release/CMakeLists.txt
> ++++ b/Release/CMakeLists.txt
> +@@ -166,12 +166,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
> +     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes
> -Wno-pointer-arith")
> +   elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
> +     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2
> -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs
> -Wpacked -Wredundant-decls)
> +-    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion
> -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts
> -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated
> -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage
> -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder
> -Wno-unused-local-typedefs)
> ++    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion
> -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts
> -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated
> -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage
> -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32
> -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor
> -Wno-unused-lambda-capture)
> +     set(WARNINGS ${WARNINGS} ${LINUX_SUPPRESSIONS})
> +     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage
> -Wno-unneeded-internal-declaration")
> +   else()
> +     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2
> -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs
> -Wpacked -Wredundant-decls)
> +-    set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion
> -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts
> -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated
> -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage
> -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder
> -Wno-unused-local-typedefs)
> ++    set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion
> -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts
> -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated
> -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage
> -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32
> -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor
> -Wno-unused-lambda-capture)
> +     set(WARNINGS ${WARNINGS} ${OSX_SUPPRESSIONS})
> +
> +     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++
> -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
> +@@ -184,7 +184,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
> + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
> +   message("-- Setting gcc options")
> +
> +-  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual
> -Wconversion -Wformat=2 -Winit-self -Winvalid-pch
> -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked
> -Wredundant-decls -Wunreachable-code)
> ++  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual
> -Wconversion -Wformat=2 -Winit-self -Winvalid-pch
> -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked
> -Wredundant-decls -Wunreachable-code -Wno-format-truncation)
> +   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
> +
> +   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11
> -fno-strict-aliasing")
> diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
> b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
> index 1dbe093bee..fea5d4b2eb 100644
> --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
> +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
> @@ -9,6 +9,7 @@ SRC_URI = "git://
> github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
>             file://fix-cmake-install.patch \
>             file://0001-Fix-a-build-problem-on-Clang.patch;patchdir=.. \
>             file://0002-Define-virtual-destructor.patch;patchdir=.. \
> +           file://0001-disable-more-Werror-warnings.patch;patchdir=.. \
>             "
>
>  # tag 2.10.2
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8
  2018-06-17  7:34   ` Martin Jansa
@ 2018-06-17  7:38     ` Khem Raj
  0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2018-06-17  7:38 UTC (permalink / raw)
  To: Martin Jansa; +Cc: openembeded-devel

On Sun, Jun 17, 2018 at 12:34 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> I think you're missing '=' in -Wno-format-truncation (it's shown in the error message, so I was always adding it with '=' as well, but it seems that both work).


there is a level you can set and that when you need '='
-Wformat-truncation is same as -Wformat-truncation=1

>
> cpprest/2.10.2-r0/git/Release/src/utilities/asyncrt_utils.cpp:702:42: error: '%s' directive output may be truncated writing up to 8 bytes into a region of size between 1 and 65 [-Werror=format-truncation=]
>          snprintf(output, sizeof(output), "%s%sZ", datetime_str, buf);
>                                           ^~~~~~~                ~~~
> cpprest/2.10.2-r0/git/Release/src/utilities/asyncrt_utils.cpp:702:17: note: 'snprintf' output between 2 and 74 bytes into a destination of size 65
>          snprintf(output, sizeof(output), "%s%sZ", datetime_str, buf);
>          ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Also can you please drop one of these? The one in meta-networking is still failing
>

yes good point.


> ./meta-oe/recipes-support/cpprest
> ./meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
> ./meta-oe/recipes-support/cpprest/cpprest-2.10.2
> ./meta-networking/recipes-support/cpprest
> ./meta-networking/recipes-support/cpprest/cpprest_2.10.2.bb
> ./meta-networking/recipes-support/cpprest/cpprest-2.10.2
>
> Added in:
> meta-oe:
> commit 9eb8b9a2c416da018c4a8acb416ef38797436f50
> Author:     Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
> AuthorDate: Thu Apr 19 19:12:07 2018 +0200
> Commit:     Armin Kuster <akuster808@gmail.com>
> CommitDate: Tue May 1 18:17:02 2018 -0700
>
>     cpprest: add new recipe based on Debian packaging
>
>     Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>     Signed-off-by: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com>
>     Co-developed-by: Cristiano Prato <cristiano.prato@cnhind.com>
>     Signed-off-by: Armin Kuster <akuster808@gmail.com>
>
> meta-networking:
> commit 12e8c3ea698905e2ed0edd9b7f351a497a1bd68d
> Author:     Gianfranco Costamagna <costamagna.gianfranco@gmail.com>
> AuthorDate: Sun Apr 29 20:02:06 2018 +0200
> Commit:     Armin Kuster <akuster808@gmail.com>
> CommitDate: Thu May 17 08:32:26 2018 -0700
>
>     cpprest: add new recipe based on Debian packaging
>
>     The patches were imported from the Debian repository
>     (https://salsa.debian.org/debian/casablanca) as of commit id 5b58637016a569a5d54714bd151a800028f77532
>
>     Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
>     Signed-off-by: Gianfranco Costamagna <gianfranco.costamagna@abinsula.com>
>     Co-developed-by: Cristiano Prato <cristiano.prato@cnhind.com>
>     Signed-off-by: Armin Kuster <akuster808@gmail.com>
>
>
> On Wed, Jun 13, 2018 at 9:01 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../0001-disable-more-Werror-warnings.patch   | 48 +++++++++++++++++++
>>  .../recipes-support/cpprest/cpprest_2.10.2.bb |  1 +
>>  2 files changed, 49 insertions(+)
>>  create mode 100644 meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
>>
>> diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
>> new file mode 100644
>> index 0000000000..febfd5bc96
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/0001-disable-more-Werror-warnings.patch
>> @@ -0,0 +1,48 @@
>> +From ee92f84a96a507b0a7a3c54929ce190ee28b4ecd Mon Sep 17 00:00:00 2001
>> +From: Alexander Moriarty <amoriarty@fetchrobotics.com>
>> +Date: Wed, 6 Jun 2018 10:38:43 -0700
>> +Subject: [PATCH] disable more -Werror warnings
>> +
>> +gcc-8: -Wno-format-truncation
>> +
>> +clang-6: -Wdelete-non-virtual-dtor
>> +clang-6: -Wunused-lambda-capture
>> +
>> +removed duplicated: -Wno-reorder
>> +
>> +This fixes #778
>> +
>> +Upstream-Status: Pending [https://github.com/Microsoft/cpprestsdk/pull/779]
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> + Release/CMakeLists.txt | 6 +++---
>> + 1 file changed, 3 insertions(+), 3 deletions(-)
>> +
>> +diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
>> +index 1267aff1..fb291ccd 100644
>> +--- a/Release/CMakeLists.txt
>> ++++ b/Release/CMakeLists.txt
>> +@@ -166,12 +166,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
>> +     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-pointer-arith")
>> +   elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
>> +     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
>> +-    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs)
>> ++    set(LINUX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture)
>> +     set(WARNINGS ${WARNINGS} ${LINUX_SUPPRESSIONS})
>> +     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
>> +   else()
>> +     set(WARNINGS -Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls)
>> +-    set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs)
>> ++    set(OSX_SUPPRESSIONS -Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor -Wno-unused-lambda-capture)
>> +     set(WARNINGS ${WARNINGS} ${OSX_SUPPRESSIONS})
>> +
>> +     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
>> +@@ -184,7 +184,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR IOS)
>> + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
>> +   message("-- Setting gcc options")
>> +
>> +-  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code)
>> ++  set(WARNINGS -Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code -Wno-format-truncation)
>> +   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
>> +
>> +   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
>> diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
>> index 1dbe093bee..fea5d4b2eb 100644
>> --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
>> +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
>> @@ -9,6 +9,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
>>             file://fix-cmake-install.patch \
>>             file://0001-Fix-a-build-problem-on-Clang.patch;patchdir=.. \
>>             file://0002-Define-virtual-destructor.patch;patchdir=.. \
>> +           file://0001-disable-more-Werror-warnings.patch;patchdir=.. \
>>             "
>>
>>  # tag 2.10.2
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-06-17  7:39 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-13  6:35 [meta-networking][PATCH V2 1/5] rdma-core: Update to version 18 Khem Raj
2018-06-13  6:35 ` [meta-oe][PATCH V2 2/5] modemmanager: Fix build with musl provide canonicalize_file_name() Khem Raj
2018-06-13  8:18   ` Andreas Müller
2018-06-13 13:45     ` Khem Raj
2018-06-13  6:35 ` [meta-networking][PATCH V2 3/5] celt051: Fix building testcases Khem Raj
2018-06-13  6:35 ` [meta-oe][PATCH V2 4/5] cpprest: Fix build with gcc-8 Khem Raj
2018-06-17  7:34   ` Martin Jansa
2018-06-17  7:38     ` Khem Raj
2018-06-13  6:35 ` [meta-networking][PATCH V2 5/5] wireshark: Update to 2.6 release Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.