diff options
| -rw-r--r-- | testing/lttng-ust/APKBUILD | 31 | ||||
| -rw-r--r-- | testing/lttng-ust/add-glibc-ifdef.patch | 21 | ||||
| -rw-r--r-- | testing/lttng-ust/glibc-strerr-r.patch | 11 | ||||
| -rw-r--r-- | testing/lttng-ust/limits-h.patch | 11 | ||||
| -rw-r--r-- | testing/lttng-ust/musl-sched-getcpu.patch | 39 |
5 files changed, 9 insertions, 104 deletions
diff --git a/testing/lttng-ust/APKBUILD b/testing/lttng-ust/APKBUILD index a697ba3af..a12ff7a3d 100644 --- a/testing/lttng-ust/APKBUILD +++ b/testing/lttng-ust/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Jeanson <mjeanson@efficios.com> # Maintainer: Michael Jeanson <mjeanson@efficios.com> pkgname=lttng-ust -pkgver=2.8.0 +pkgver=2.8.1 pkgrel=0 pkgdesc="LTTng 2.0 Userspace Tracer" url="https://lttng.org" @@ -12,20 +12,19 @@ depends_dev="" makedepends="$depends_dev userspace-rcu-dev util-linux-dev bash" install="" subpackages="$pkgname-dev $pkgname-doc" -source="https://lttng.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 - add-glibc-ifdef.patch - musl-sched-getcpu.patch - limits-h.patch - glibc-strerr-r.patch" +source="https://lttng.org/files/$pkgname/$pkgname-$pkgver.tar.bz2" builddir="$srcdir"/$pkgname-$pkgver build() { cd "$builddir" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ --prefix=/usr \ + --disable-static \ || return 1 - make || return 1 + make V=1 || return 1 make check || return 1 } @@ -43,18 +42,6 @@ dev() { rm -rf "$subpkgdir"/usr/share/doc/$pkgname } -md5sums="7b14452e7303dc4bc8475f1415223318 lttng-ust-2.8.0.tar.bz2 -4bd907494a789071aab14608285b3191 add-glibc-ifdef.patch -2189378d85923ce21a1cb4041596cd6c musl-sched-getcpu.patch -425eca46145ddfcb2efb1409a4904311 limits-h.patch -6eac280be76be9b4b1e1236ff52d9c9b glibc-strerr-r.patch" -sha256sums="6df651e56951ac233d36992f306aca8dbf065d2b0f0986d9a4863b6544ae7bb3 lttng-ust-2.8.0.tar.bz2 -985c6c15790117b6c8280342cc3ab310b58c3766d9585955f2530e3cdf2d89e1 add-glibc-ifdef.patch -581c59bd2766b0afd0e8ee1a6b0a7711210b8e3915b7592282c5dcb5a4a0537e musl-sched-getcpu.patch -e7ddc8ee806ed3cfc8df4788f537c8ca59c9d376352ba89e4ab692ea20032228 limits-h.patch -be829191bfbd5fa6004d6de73704cd49fd7a612b1685218912f660de30fbf0be glibc-strerr-r.patch" -sha512sums="7705e950539d61ec599d762d2a7aef59a10c2f692e2cfe735cd887ba706d478ae99b16292c2043ed868e93211e413c04c684d679cedd822e9ed22485288f5868 lttng-ust-2.8.0.tar.bz2 -dabe48d51370bc1063c18a215b9820b8217f8c84b6c2fa11ee823edc89222c3c3d8712be32fce61c9fd2da5902a881b0bdd451c3420583dffc36e41ea4f5fc2d add-glibc-ifdef.patch -29d5e856966a9489a608c6aa915a3a9a800cdfd13af0df28f3420fa1438bb0361e0670182b96710adb49076a254c48225410b52a3f6a67f96a024f4bc93e2494 musl-sched-getcpu.patch -e5b7549c25b4ed9aeb0240dda00f6010424d7d2747c6e19325d0b162b89aa7ef609667f7564d4b0a703e967ca1f0b3dda110a2d3e0b81b281e0d82566d9f74ec limits-h.patch -8d3ff539d07eafd66a83ac6196706c7eda6bfef9a86d32df307a6fa9860675b2e610419e9009021f01236298be43da9f7b883eff9586354768ad767e8482db2b glibc-strerr-r.patch" +md5sums="be505077245dc05f93370a565eec15f4 lttng-ust-2.8.1.tar.bz2" +sha256sums="6e41349107e83e7b43c69ed358e48788ca2fd095bad61737b850e3f3d2c0508a lttng-ust-2.8.1.tar.bz2" +sha512sums="15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95 lttng-ust-2.8.1.tar.bz2" diff --git a/testing/lttng-ust/add-glibc-ifdef.patch b/testing/lttng-ust/add-glibc-ifdef.patch deleted file mode 100644 index b367b922b..000000000 --- a/testing/lttng-ust/add-glibc-ifdef.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lttng-ust-2.8.0.orig/include/lttng/ust-dlfcn.h -+++ lttng-ust-2.8.0/include/lttng/ust-dlfcn.h -@@ -31,6 +31,8 @@ - #error "Please include lttng/ust-dlfcn.h before dlfcn.h." - #endif /* _DLFCN_H */ - -+#ifdef __GLIBC__ -+ - /* - * glibc declares dlsym() and dlerror() with __attribute__((leaf)) (see - * THROW annotation). Unfortunately, this is not in sync with reality, -@@ -57,5 +59,9 @@ - extern void *dlsym(void *__restrict __handle, - __const char *__restrict __name) __nonnull ((2)); - extern char *dlerror(void); -+ -+#else -+#include <dlfcn.h> -+#endif /* __GLIBC__ */ - - #endif /* _LTTNG_UST_DLFCN_H */ diff --git a/testing/lttng-ust/glibc-strerr-r.patch b/testing/lttng-ust/glibc-strerr-r.patch deleted file mode 100644 index fa774139d..000000000 --- a/testing/lttng-ust/glibc-strerr-r.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lttng-ust-2.8.0.orig/include/usterr-signal-safe.h -+++ lttng-ust-2.8.0/include/usterr-signal-safe.h -@@ -106,7 +106,7 @@ - #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args) - #define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args) - --#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) -+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) - /* - * Version using XSI strerror_r. - */ diff --git a/testing/lttng-ust/limits-h.patch b/testing/lttng-ust/limits-h.patch deleted file mode 100644 index 6492823a0..000000000 --- a/testing/lttng-ust/limits-h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lttng-ust-2.8.0.orig/tests/ust-elf/prog.c -+++ lttng-ust-2.8.0/tests/ust-elf/prog.c -@@ -16,7 +16,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include <linux/limits.h> -+#include <limits.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> diff --git a/testing/lttng-ust/musl-sched-getcpu.patch b/testing/lttng-ust/musl-sched-getcpu.patch deleted file mode 100644 index 48f3b43e5..000000000 --- a/testing/lttng-ust/musl-sched-getcpu.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- lttng-ust-2.8.0.orig/libringbuffer/getcpu.h -+++ lttng-ust-2.8.0/libringbuffer/getcpu.h -@@ -47,10 +47,6 @@ - */ - #ifdef __linux__ - --/* old uClibc versions didn't have sched_getcpu */ --#if defined(__UCLIBC__) && __UCLIBC_MAJOR__ == 0 && \ -- (__UCLIBC_MINOR__ < 9 || \ -- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) - #include <sys/syscall.h> - #define __getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) - /* -@@ -64,25 +60,8 @@ - ret = __getcpu(&cpu, NULL, NULL); - if (caa_unlikely(ret < 0)) - return 0; -- return c; --} --#else /* __UCLIBC__ */ --#include <sched.h> -- --/* -- * If getcpu is not implemented in the kernel, use cpu 0 as fallback. -- */ --static inline --int lttng_ust_get_cpu_internal(void) --{ -- int cpu; -- -- cpu = sched_getcpu(); -- if (caa_unlikely(cpu < 0)) -- return 0; - return cpu; - } --#endif /* __UCLIBC__ */ - - #elif (defined(__FreeBSD__) || defined(__CYGWIN__)) - |