From b2e3e0c0ee71815445581f7cba26079015002510 Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Wed, 1 Nov 2023 15:51:49 -0300
Subject: [PATCH] chrpath: fix build with gcc13. (#9721)

---
 app-admin/chrpath/chrpath-0.16.recipe         |  2 ++
 .../chrpath/patches/chrpath-0.16.patchset     | 27 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app-admin/chrpath/chrpath-0.16.recipe b/app-admin/chrpath/chrpath-0.16.recipe
index 6ba187adc..247e80fe7 100644
--- a/app-admin/chrpath/chrpath-0.16.recipe
+++ b/app-admin/chrpath/chrpath-0.16.recipe
@@ -31,12 +31,14 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
+	cmd:autoconf
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	"
 
 BUILD()
 {
+	autoconf
 	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }
diff --git a/app-admin/chrpath/patches/chrpath-0.16.patchset b/app-admin/chrpath/patches/chrpath-0.16.patchset
index dbf32f672..a6f354d69 100644
--- a/app-admin/chrpath/patches/chrpath-0.16.patchset
+++ b/app-admin/chrpath/patches/chrpath-0.16.patchset
@@ -1,4 +1,4 @@
-From 5ce86fd44694055d87e2cc2a3e1500f293bfe3ed Mon Sep 17 00:00:00 2001
+From 933058af2ad18c9bfc2b0b126c54789142c657af Mon Sep 17 00:00:00 2001
 From: Oscar Lesta <oscar.lesta@gmail.com>
 Date: Sat, 13 May 2023 16:47:24 -0300
 Subject: Fix build on Haiku
@@ -35,5 +35,28 @@ index f24bc06..b16b1cc 100644
    Elf32_Phdr e32;
    Elf64_Phdr e64;
 -- 
-2.37.3
+2.42.0
+
+
+From cc8a8584df0ac12a661b0665b60d105ac8a18921 Mon Sep 17 00:00:00 2001
+From: Oscar Lesta <oscar.lesta@gmail.com>
+Date: Wed, 1 Nov 2023 15:38:44 -0300
+Subject: Fix build with GCC13.
+
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 73a7097..debcbd8 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -22,7 +22,7 @@ esac
+ AC_DEFUN([CHRPATH_LDRPATH_OPTION],
+ [AC_REQUIRE([AC_CANONICAL_TARGET])[]dnl
+ case "$target" in
+-	*-linux*|*-gnu*|*-k*bsd*-gnu)
++	*-linux*|*-gnu*|*-k*bsd*-gnu|*-haiku*)
+ 		LDRPATH=-Wl,-rpath,
+ 		;;
+ 	*-*-irix*|*-*-osf*)
+-- 
+2.42.0