Skip to content

Commit

Permalink
tools/elfutils: refresh portability patch for macOS
Browse files Browse the repository at this point in the history
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@gmail.com> # MacOS
Signed-off-by: Michael Pratt <mcpratt@pm.me>
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
  • Loading branch information
mcprat authored and guidosarducci committed Apr 15, 2024
1 parent d1f01a3 commit 30cd444
Showing 1 changed file with 5 additions and 29 deletions.
34 changes: 5 additions & 29 deletions tools/elfutils/patches/100-portability.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -373,7 +373,7 @@
+#include <libeu.h>
#include <libdw.h>
#include <dwarf.h>
+#include <libgen.h>
+#include <dirname.h>


/* Known location expressions already decoded. */
Expand Down Expand Up @@ -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>



0 comments on commit 30cd444

Please sign in to comment.