summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2016-08-06 14:44:18 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-08-06 21:53:58 +0200
commitd1dbd48ddc6e01e3a38e97d95af8bd96b5528fb1 (patch)
treef433d1078bc6080d40a0426aacc1e8dca9068ed7
parent8f524f909e30cd02ce1f4677ffb59a22bbcaf974 (diff)
downloadbuildroot-d1dbd48ddc6e01e3a38e97d95af8bd96b5528fb1.tar.gz
buildroot-d1dbd48ddc6e01e3a38e97d95af8bd96b5528fb1.zip
package/lttng-libust: fix build with musl
Backport two patches from upstream to fix build with musl. Fixes: http://autobuild.buildroot.org/results/dcb/dcb6c3aadf6f955016cf3c3f9b917cbec6d29342/ http://autobuild.buildroot.org/results/deb/deb80eea5ceae3e7f8e0549596dce2fb6a1e7596/ http://autobuild.buildroot.org/results/91e/91e64477864825c39911e3f3d0a2459f2987c209/ [...and a lot more...] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Philippe Proulx <eeppeliteloop@gmail.com> Cc: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/lttng-libust/lttng-libust.hash4
-rw-r--r--package/lttng-libust/lttng-libust.mk4
2 files changed, 8 insertions, 0 deletions
diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
index 57c7e003ae..1494acf64c 100644
--- a/package/lttng-libust/lttng-libust.hash
+++ b/package/lttng-libust/lttng-libust.hash
@@ -1,2 +1,6 @@
# http://www.lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2.sha1
sha1 597ebecb885debb58c263de57f30b1096d4eefc6 lttng-ust-2.7.1.tar.bz2
+
+# Locally computed
+sha1 2e79c98e458b2e052930fb81441e6ca8377a2ed7 787364e8bac9a146f9d65c763633c2b75eb76463.patch
+sha1 cf77ec415111f77573be7917d9b62d8e49dc6304 30307a67b48641875b122d8f832bbfb454e95d92.patch
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 4a65057c45..61ffed4287 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -10,6 +10,10 @@ LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
+LTTNG_LIBUST_PATCH = \
+ https://github.com/lttng/lttng-ust/commit/787364e8bac9a146f9d65c763633c2b75eb76463.patch \
+ https://github.com/lttng/lttng-ust/commit/30307a67b48641875b122d8f832bbfb454e95d92.patch
+
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
OpenPOWER on IntegriCloud