0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. usb_linux.c: fix minor()/major() build failure due to glibc 2.28
  2. glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
  3. and therefore <sys/sysmacros.h> must be included explicitly when
  4. major()/minor() are used.
  5. This commit adds a patch to directly include <sys/sysmacros.h> into
  6. all usb_linux.c files where minor() and major() macros are used.
  7. diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c
  8. --- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
  9. +++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c 2018-09-09 11:47:16.476292546 +0200
  10. @@ -20,6 +20,7 @@
  11. #include <string.h>
  12. #include <sys/ioctl.h>
  13. +#include <sys/sysmacros.h>
  14. #include <sys/types.h>
  15. #include <sys/time.h>
  16. #include <dirent.h>
  17. diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c
  18. --- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c 2018-09-09 02:32:57.154503866 +0200
  19. +++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c 2018-09-09 11:47:28.148353880 +0200
  20. @@ -20,6 +20,7 @@
  21. #include <string.h>
  22. #include <sys/ioctl.h>
  23. +#include <sys/sysmacros.h>
  24. #include <sys/types.h>
  25. #include <sys/time.h>
  26. #include <dirent.h>
  27. diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c
  28. --- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
  29. +++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c 2018-09-09 11:46:53.028169154 +0200
  30. @@ -33,6 +33,7 @@
  31. #include <sys/ioctl.h>
  32. #include <sys/stat.h>
  33. +#include <sys/sysmacros.h>
  34. #include <sys/types.h>
  35. #include <dirent.h>
  36. #include <fcntl.h>