1 files changed, 30 insertions, 21 deletions

diff --git a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch
index 07ab9a03b5..699eb61550 100644
--- a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch
+++ b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch
@@ -1,4 +1,4 @@
-From 918f3ef01c7a67f3beb67307966698474f144581 Mon Sep 17 00:00:00 2001
+From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001
 From: Philip Balister <philip@balister.org>
 Date: Wed, 8 Jul 2020 09:41:43 -0400
 Subject: [PATCH] Do not strip binaries.
@@ -6,34 +6,43 @@ Subject: [PATCH] Do not strip binaries.
  * OpenEmbedded strips them after creating debug packages.
 
 Signed-off-by: Philip Balister <philip@balister.org>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
 ---
- tools/pybind11Tools.cmake | 13 -------------
- 1 file changed, 13 deletions(-)
+ tools/pybind11NewTools.cmake | 5 -----
+ tools/pybind11Tools.cmake    | 4 ----
+ 2 files changed, 9 deletions(-)
 
+diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake
+index 18da8be1..82ebf5e7 100644
+--- a/tools/pybind11NewTools.cmake
++++ b/tools/pybind11NewTools.cmake
+@@ -246,11 +246,6 @@ function(pybind11_add_module target_name)
+     endif()
+   endif()
+ 
+-  if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo)
+-    # Strip unnecessary sections of the binary on Linux/macOS
+-    pybind11_strip(${target_name})
+-  endif()
+-
+   if(MSVC)
+     target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
+   endif()
 diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake
-index a3603ab..b4c8f63 100644
+index 32313539..a7d81012 100644
 --- a/tools/pybind11Tools.cmake
 +++ b/tools/pybind11Tools.cmake
-@@ -230,19 +230,6 @@ function(pybind11_add_module target_name)
- 
-   _pybind11_add_lto_flags(${target_name} ${ARG_THIN_LTO})
+@@ -201,10 +201,6 @@ function(pybind11_add_module target_name)
+     endif()
+   endif()
  
--  if (NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo)
--    # Strip unnecessary sections of the binary on Linux/Mac OS
--    if(CMAKE_STRIP)
--      if(APPLE)
--        add_custom_command(TARGET ${target_name} POST_BUILD
--                           COMMAND ${CMAKE_STRIP} -x $<TARGET_FILE:${target_name}>)
--      else()
--        add_custom_command(TARGET ${target_name} POST_BUILD
--                           COMMAND ${CMAKE_STRIP} $<TARGET_FILE:${target_name}>)
--      endif()
--    endif()
+-  if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo)
+-    pybind11_strip(${target_name})
 -  endif()
 -
    if(MSVC)
-     # /MP enables multithreaded builds (relevant when there are many files), /bigobj is
-     # needed for bigger binding projects due to the limit to 64k addressable sections
+     target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
+   endif()
 -- 
-2.25.4
+2.17.1