0004-Fix-build-issue-with-musl.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From d14ca3e3362448590adaebacb76d4d8046f9b556 Mon Sep 17 00:00:00 2001
  2. From: Gary Bisson <gary.bisson@boundarydevices.com>
  3. Date: Sun, 1 Dec 2024 15:44:16 +0100
  4. Subject: [PATCH] Fix build issue with musl
  5. arpa/nameser.h doesn't use the same macro name to avoid several
  6. inclusions.
  7. Finally had an issue with framebuffer_service.c since it was missing the
  8. TEMP_FAILURE_RETRY macro.
  9. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
  10. ---
  11. core/adbd/arpa_nameser.h | 3 +++
  12. core/adbd/framebuffer_service.c | 1 +
  13. 2 files changed, 4 insertions(+)
  14. diff --git a/core/adbd/arpa_nameser.h b/core/adbd/arpa_nameser.h
  15. index 438dc04..f3d2fee 100644
  16. --- a/core/adbd/arpa_nameser.h
  17. +++ b/core/adbd/arpa_nameser.h
  18. @@ -52,6 +52,8 @@
  19. #ifndef _ARPA_NAMESER_H_
  20. #define _ARPA_NAMESER_H_
  21. +#ifndef _ARPA_NAMESER_H
  22. +#define _ARPA_NAMESER_H
  23. #define BIND_4_COMPAT
  24. @@ -574,4 +576,5 @@ __END_DECLS
  25. #define XLOG(...) do {} while (0)
  26. #endif
  27. +#endif /* !_ARPA_NAMESER_H */
  28. #endif /* !_ARPA_NAMESER_H_ */
  29. diff --git a/core/adbd/framebuffer_service.c b/core/adbd/framebuffer_service.c
  30. index 20c08d2..48e0241 100644
  31. --- a/core/adbd/framebuffer_service.c
  32. +++ b/core/adbd/framebuffer_service.c
  33. @@ -26,6 +26,7 @@
  34. #include "fdevent.h"
  35. #include "adb.h"
  36. +#include <cutils/fs.h>
  37. #include <linux/fb.h>
  38. #include <sys/ioctl.h>
  39. #include <sys/mman.h>
  40. --
  41. 2.47.0