Files
haikuports/app-admin/chrpath/patches/chrpath-0.16.patchset
2023-11-01 19:51:49 +01:00

63 lines
1.2 KiB
Plaintext

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
diff --git a/protos.h b/protos.h
index f24bc06..b16b1cc 100644
--- a/protos.h
+++ b/protos.h
@@ -1,7 +1,14 @@
#ifndef PROTOS_H
#define PROTOS_H
+#ifdef __HAIKU__
+ #include <ByteOrder.h>
+ #define bswap_16 B_SWAP_INT16
+ #define bswap_32 B_SWAP_INT32
+ #define bswap_64 B_SWAP_INT64
+#else
#include <byteswap.h>
+#endif
#include <elf.h>
#include "config.h"
@@ -25,6 +32,10 @@ typedef union {
Elf64_Shdr e64;
} Elf_Shdr;
+#ifdef __HAIKU__
+ #undef Elf_Phdr
+#endif
+
typedef union {
Elf32_Phdr e32;
Elf64_Phdr e64;
--
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