Skip to content

Commit

Permalink
Merge pull request #1660 from MaxKrummenacher/master
Browse files Browse the repository at this point in the history
isp-imx: fix compile with boost 1.83.0
  • Loading branch information
otavio authored Oct 9, 2023
2 parents 1366c9c + 3f732be commit e0939d9
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 15aae364fb52df30e4a49e73e2048fdc633e6868 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <[email protected]>
Date: Sun, 8 Oct 2023 09:15:54 -0300
Subject: [PATCH] cpp-netlib: parsers.ipp: add missing include

With the update to boost from 1.82.0 -> 1.83.0 we now get compiler errors:

| .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:58:3: error: 'u8_to_u32_iterator' was not declared in this scope

Add the missing explicit include. Before the file was indirectly included from qi.hpp:

| In file included from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/regex/pending/unicode_iterator.hpp:27,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/utf8.hpp:15,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/support/info.hpp:17,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/domain.hpp:16,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/meta_compiler.hpp:15,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action/action.hpp:14,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi/action.hpp:14,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/home/qi.hpp:14,
| from .../isp-imx/4.2.2.22.0/recipe-sysroot/usr/include/boost/spirit/include/qi.hpp:16,
| from .../isp-imx/4.2.2.22.0/isp-imx-4.2.2.22.0/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp:5,

Upstream-Status: Pending

Signed-off-by: Max Krummenacher <[email protected]>
---
.../boost/network/protocol/http/server/impl/parsers.ipp | 1 +
1 file changed, 1 insertion(+)

diff --git a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
index c31e60e..2b83fbe 100755
--- a/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
+++ b/utils3rd/3rd/cpp-netlib/boost/network/protocol/http/server/impl/parsers.ipp
@@ -13,6 +13,7 @@
#include <tuple>
#include <boost/fusion/include/std_tuple.hpp>
#include <boost/network/protocol/http/message/header.hpp>
+#include <boost/regex/pending/unicode_iterator.hpp>

#ifdef BOOST_NETWORK_NO_LIB
#ifndef BOOST_NETWORK_INLINE
--
2.35.3

5 changes: 4 additions & 1 deletion recipes-bsp/isp-imx/isp-imx_4.2.2.22.0.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
DEPENDS = "boost libdrm virtual/libg2d libtinyxml2"

SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
SRC_URI = " \
${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
file://0001-cpp-netlib-parsers.ipp-add-missing-include.patch \
"

SRC_URI[md5sum] = "693e76b20985de607208c21d996019f8"
SRC_URI[sha256sum] = "c2f450502390442926920d6457bbf24378c0338a445be180130ec6b1b12d1056"
Expand Down

0 comments on commit e0939d9

Please sign in to comment.