[openwrt/openwrt] tools/elfutils: refresh portability patch for macOS

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/1991bfb8143d29d619a0a389db84dcb512b9a719

commit 1991bfb8143d29d619a0a389db84dcb512b9a719
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Mon Apr 8 15:15:31 2024 -0400

    tools/elfutils: refresh portability patch for macOS
    
    Quilt refresh combined two sets of changes to the same file.
    
    The switch from using libgen.h to dirname.h because of function poisoning
    from gnulib's import of basename() was added as a new patch hunk instead
    of an edit to the original one.
    
    The original patch hunk was to fix build errors on an earlier version of
    elfutils before the "dirname" module was being imported to fix further
    build errors with the 0.191 version.
    
    Tested-by: Georgi Valkov <gvalkov at gmail.com> # MacOS
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    Signed-off-by: Tony Ambardar <itugrok at yahoo.com>
---
 tools/elfutils/patches/100-portability.patch | 34 ++++------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/tools/elfutils/patches/100-portability.patch b/tools/elfutils/patches/100-portability.patch
index 9a111c76d9..1a61455f48 100644
--- a/tools/elfutils/patches/100-portability.patch
+++ b/tools/elfutils/patches/100-portability.patch
@@ -351,7 +351,7 @@
  #include <libdwfl.h>
  #include <libebl.h>
 +#include <libeu.h>
-+#include <libgen.h>
++#include <dirname.h>
  #include <assert.h>
  #include <dirent.h>
  #include <errno.h>
@@ -373,7 +373,7 @@
 +#include <libeu.h>
  #include <libdw.h>
  #include <dwarf.h>
-+#include <libgen.h>
++#include <dirname.h>
  
  
  /* Known location expressions already decoded.  */
@@ -893,32 +893,8 @@
 @@ -27,6 +27,7 @@
     the GNU Lesser General Public License along with this program.  If
     not, see <http://www.gnu.org/licenses/>.  */
-
+ 
 +#include <config.h>
  #include <stddef.h>
-
-
---- a/libdw/libdwP.h
-+++ b/libdw/libdwP.h
-@@ -35,7 +35,7 @@
- #include <libeu.h>
- #include <libdw.h>
- #include <dwarf.h>
--#include <libgen.h>
-+#include <dirname.h>
-
-
- /* Known location expressions already decoded.  */
-
---- a/libdwfl/libdwflP.h
-+++ b/libdwfl/libdwflP.h
-@@ -32,7 +32,7 @@
- #include <libdwfl.h>
- #include <libebl.h>
- #include <libeu.h>
--#include <libgen.h>
-+#include <dirname.h>
- #include <assert.h>
- #include <dirent.h>
- #include <errno.h>
-
+ 
+