From 04bd5067a2689e86a1928afac0aa3703114cd782 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 26 Apr 2012 11:04:56 +0200 Subject: [PATCH] lttng-libust: fix build with modern uClibc versions uClibc got sched_getcpu in 0.9.33, so the compat workaround should only be used for older uClibc versions. Signed-off-by: Peter Korsgaard --- .../lttng-libust-uclibc-sched_getcpu.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch diff --git a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch new file mode 100644 index 0000000000..65361858f2 --- /dev/null +++ b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch @@ -0,0 +1,32 @@ +[PATCH] fix build with modern uClibc + +uClibc has sched_getcpu since 0.9.33, so the compat workaround should only +be used for older uClibc versions. + +Signed-off-by: Peter Korsgaard +--- + liblttng-ust/compat.h | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: lttng-ust-1.9.2/liblttng-ust/compat.h +=================================================================== +--- lttng-ust-1.9.2.orig/liblttng-ust/compat.h ++++ lttng-ust-1.9.2/liblttng-ust/compat.h +@@ -17,6 +17,10 @@ + #include + + #ifdef __UCLIBC__ ++/* old uClibc versions didn't have sched_getcpu */ ++#if __UCLIBC_MAJOR__ == 0 && \ ++ (__UCLIBC_MINOR__ < 9 || \ ++ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) + #define __getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) + static inline + int sched_getcpu(void) +@@ -26,5 +30,6 @@ + s = __getcpu(&c, NULL, NULL); + return (s == -1) ? s : c; + } ++#endif /* <= 0.9.32 */ + #endif /* __UCLIBC__ */ + #endif /* _UST_COMPAT_H */ -- 2.30.2