From 734bf30d546f92ef31931793b5ca0b7fb27c09cf Mon Sep 17 00:00:00 2001
From: AntonHorbach <antos.horbach@gmail.com>
Date: Sun, 31 Oct 2021 10:34:03 +0300
Subject: [PATCH] boost: checking libiconv exists even if libc already found

---
 .../all/patches/1.69.0-locale-no-system.patch     |  2 +-
 .../boost_locale_fail_on_missing_backend.patch    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/recipes/boost/all/patches/1.69.0-locale-no-system.patch b/recipes/boost/all/patches/1.69.0-locale-no-system.patch
index 34aa635cdef11..a2ca64eb92300 100644
--- a/recipes/boost/all/patches/1.69.0-locale-no-system.patch
+++ b/recipes/boost/all/patches/1.69.0-locale-no-system.patch
@@ -1,7 +1,7 @@
 This library links to boost_system, even though that library is header-only.
 --- libs/locale/build/Jamfile.v2
 +++ libs/locale/build/Jamfile.v2
-@@ -403,7 +403,7 @@
+@@ -410,7 +410,7 @@
          result += <source>util/gregorian.cpp ;
      }
      
diff --git a/recipes/boost/all/patches/boost_locale_fail_on_missing_backend.patch b/recipes/boost/all/patches/boost_locale_fail_on_missing_backend.patch
index 57a64214cf9eb..f1a0b7958449e 100644
--- a/recipes/boost/all/patches/boost_locale_fail_on_missing_backend.patch
+++ b/recipes/boost/all/patches/boost_locale_fail_on_missing_backend.patch
@@ -10,14 +10,21 @@ index 578e722..b715f59 100644
  feature.feature boost.locale.icu : on off :  optional propagated ;
  feature.feature boost.locale.posix : on off : optional propagated ;
  feature.feature boost.locale.std : on off : optional propagated ;
-@@ -217,6 +218,14 @@ rule configure-full ( properties * : flags-only )
+@@ -217,6 +217,21 @@ rule configure-full ( properties * : flags-only )
          if [ configure.builds has_iconv : $(properties) : "iconv (libc)" ]
          {
              found-iconv = true ;
 +            if <boost.locale.iconv.lib>libiconv in $(properties)
-+            {
-+                EXIT "- Boost.Locale found iconv (libc) instead of iconv (separate) library to be built." ;
-+            }
++			 {
++               if [ configure.builds has_external_iconv : $(properties) : "iconv (separate)" ]
++               {
++                   result += <library>iconv ;
++               }
++               else
++               {
++                   EXIT "- Boost.Locale found iconv (libc) instead of iconv (separate) library to be built." ;
++               }
++			 }
 +        }
 +        else if <boost.locale.iconv.lib>libc in $(properties)
 +        {