rt-tests-uclibc.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103
  1. [PATCH] fix build with uClibc
  2. Fix two build issues with (modern) uClibc:
  3. - uClibc has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME,
  4. conflicting with emulation function
  5. - uClibc doesn't provide utmpx.h if not built with UCLIBC_HAS_UTMPX, which
  6. is included in several files (but not needed).
  7. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  8. ---
  9. src/backfire/sendme.c | 1 -
  10. src/cyclictest/cyclictest.c | 3 ++-
  11. src/pmqtest/pmqtest.c | 1 -
  12. src/ptsematest/ptsematest.c | 1 -
  13. src/sigwaittest/sigwaittest.c | 2 --
  14. src/svsematest/svsematest.c | 1 -
  15. 6 files changed, 2 insertions(+), 7 deletions(-)
  16. Index: rt-tests-0.83/src/backfire/sendme.c
  17. ===================================================================
  18. --- rt-tests-0.83.orig/src/backfire/sendme.c
  19. +++ rt-tests-0.83/src/backfire/sendme.c
  20. @@ -32,7 +32,6 @@
  21. #include "rt-utils.h"
  22. #include "rt-get_cpu.h"
  23. -#include <utmpx.h>
  24. #include <sys/types.h>
  25. #include <sys/stat.h>
  26. #include <sys/time.h>
  27. Index: rt-tests-0.83/src/cyclictest/cyclictest.c
  28. ===================================================================
  29. --- rt-tests-0.83.orig/src/cyclictest/cyclictest.c
  30. +++ rt-tests-0.83/src/cyclictest/cyclictest.c
  31. @@ -23,6 +23,7 @@
  32. #include <string.h>
  33. #include <time.h>
  34. #include <errno.h>
  35. +#include <features.h>
  36. #include <limits.h>
  37. #include <linux/unistd.h>
  38. @@ -53,7 +54,7 @@
  39. #define gettid() syscall(__NR_gettid)
  40. #define sigev_notify_thread_id _sigev_un._tid
  41. -#ifdef __UCLIBC__
  42. +#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_ADVANCED_REALTIME__)
  43. #define MAKE_PROCESS_CPUCLOCK(pid, clock) \
  44. ((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
  45. #define CPUCLOCK_SCHED 2
  46. Index: rt-tests-0.83/src/pmqtest/pmqtest.c
  47. ===================================================================
  48. --- rt-tests-0.83.orig/src/pmqtest/pmqtest.c
  49. +++ rt-tests-0.83/src/pmqtest/pmqtest.c
  50. @@ -33,7 +33,6 @@
  51. #include <sys/time.h>
  52. #include <sys/mman.h>
  53. #include <linux/unistd.h>
  54. -#include <utmpx.h>
  55. #include <mqueue.h>
  56. #include "rt-utils.h"
  57. #include "rt-get_cpu.h"
  58. Index: rt-tests-0.83/src/ptsematest/ptsematest.c
  59. ===================================================================
  60. --- rt-tests-0.83.orig/src/ptsematest/ptsematest.c
  61. +++ rt-tests-0.83/src/ptsematest/ptsematest.c
  62. @@ -33,7 +33,6 @@
  63. #include <sys/time.h>
  64. #include <sys/mman.h>
  65. #include <linux/unistd.h>
  66. -#include <utmpx.h>
  67. #include "rt-utils.h"
  68. #include "rt-get_cpu.h"
  69. Index: rt-tests-0.83/src/sigwaittest/sigwaittest.c
  70. ===================================================================
  71. --- rt-tests-0.83.orig/src/sigwaittest/sigwaittest.c
  72. +++ rt-tests-0.83/src/sigwaittest/sigwaittest.c
  73. @@ -31,11 +31,9 @@
  74. #include <signal.h>
  75. #include <string.h>
  76. #include <time.h>
  77. -#include <utmpx.h>
  78. #include <sys/types.h>
  79. #include <sys/time.h>
  80. #include <linux/unistd.h>
  81. -#include <utmpx.h>
  82. #include "rt-utils.h"
  83. #include "rt-get_cpu.h"
  84. Index: rt-tests-0.83/src/svsematest/svsematest.c
  85. ===================================================================
  86. --- rt-tests-0.83.orig/src/svsematest/svsematest.c
  87. +++ rt-tests-0.83/src/svsematest/svsematest.c
  88. @@ -31,7 +31,6 @@
  89. #include <sched.h>
  90. #include <string.h>
  91. #include <time.h>
  92. -#include <utmpx.h>
  93. #include <linux/unistd.h>