Subject: [alpine-aports] [PATCH] testing/lttng-tools: upgrade to 2.10.6

From: Michael Jeanson <[email-masked]>
Date: Wed, 20 Mar 2019 12:14:53 -0500

---
 ...db67743d08f418235fee43747bb9d42d62ce.patch | 29 +++++++++++++++++++
 testing/lttng-tools/APKBUILD                  | 23 +++++++++------
 2 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch

diff --git a/testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch b/testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch
new file mode 100644
index 0000000000..bc3c5382e3
--- /dev/null
+++ b/testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch
@@ -0,0 +1,29 @@
+From 9193db67743d08f418235fee43747bb9d42d62ce Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <[email-masked]>
+Date: Fri, 15 Mar 2019 11:19:27 -0400
+Subject: [PATCH] fix: tests: link libpause_consumer on liblttng-ctl
+
+This preload test library uses symbols from liblttng-ctl which are
+resolved when preloaded by GLIBC but not by MUSL.
+
+Signed-off-by: Michael Jeanson <[email-masked]>
+---
+ tests/regression/tools/notification/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
+index 33e95886d..b869bdb1d 100644
+--- a/tests/regression/tools/notification/Makefile.am
++++ b/tests/regression/tools/notification/Makefile.am
+@@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
+ 			   -rpath $(abs_builddir)
+ 
+ libpause_consumer_la_SOURCES = consumer_testpoints.c
+-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
++libpause_consumer_la_LIBADD = \
++	$(top_builddir)/src/common/libcommon.la \
++	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
++	$(DL_LIBS)
+ libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
+ noinst_LTLIBRARIES = libpause_consumer.la
+ 
diff --git a/testing/lttng-tools/APKBUILD b/testing/lttng-tools/APKBUILD
index 08e344eae6..9d4c8c1c8c 100644
--- a/testing/lttng-tools/APKBUILD
+++ b/testing/lttng-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Jeanson <[email-masked]>
 # Maintainer: Michael Jeanson <[email-masked]>
 pkgname=lttng-tools
-pkgver=2.9.6
+pkgver=2.10.6
 pkgrel=0
 pkgdesc="LTTng 2.0 control and utility programs"
 url="https://lttng.org"
@@ -14,7 +14,7 @@ makedepends="$depends_dev bash grep coreutils automake autoconf"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://lttng.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
-	musl-has-no-dlmopen.patch"
+	9193db67743d08f418235fee43747bb9d42d62ce.patch"
 
 builddir="$srcdir/$pkgname-$pkgver"
 
@@ -22,25 +22,30 @@ build() {
 	cd "$builddir"
 
 	unset LDFLAGS
+	autoreconf -i # Because we patch a Makefile.am
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--localstatedir=/var \
-		|| return 1
-	make V=1 || return 1
-	make -j1 check || return 1
+		--localstatedir=/var
+	make V=1
+}
+
+check() {
+	cd "$builddir"
+
+	make -j1 check
 }
 
 package() {
 	cd "$builddir"
 
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
 	mv "$pkgdir"/usr/share/doc/$pkgname/LICENSE \
 		"$pkgdir"/usr/share/licenses/$pkgname/
 }
 
-sha512sums="5fc9da4280587c4dc3c695f713e3ae51ad46a9bd0c82d4241a95f406e2644ef296d46c507171b7adc549a933f3abc64c993106287a84a0b8c6901b3b122a0646  lttng-tools-2.9.6.tar.bz2
-cb5136007b0d8ea0a84557ab025e709dc4c5d818272f057a9f6c78ed7cf5104b9d904a1b8c5e8674e3455fe85dc28bb890c190cc04f0c1d9c29d87b40dadb88b  musl-has-no-dlmopen.patch"
+sha512sums="d33379687755b1c97036d69abcf778278adc099e8c44f94b1f1c610011bf8f0da66a2743f39cb9798c72a2e6218bb31c4d392ff4269dbf0d6a694294458f231d  lttng-tools-2.10.6.tar.bz2
+63fa29f2f6ee7065cc8c44663428ecf2b8c1d4557214e6aa04a863168f73bbe532f2ee7d55fc23a30fda1ab03c4434b857f3778a7807eba573e01959b2288ac9  9193db67743d08f418235fee43747bb9d42d62ce.patch"
-- 
2.21.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Natanael Copa <[email-masked]>
Date: Thu, 21 Mar 2019 11:02:29 +0100

On Wed, 20 Mar 2019 12:14:53 -0500
Michael Jeanson <[email-masked]> wrote:

Hi!
  
> +	autoreconf -i # Because we patch a Makefile.am

We also need to add libtool to makedepends for this.

> -	make -j1 check || return 1

The test suite hangs for me here.

-nc

---

---

From: Michael Jeanson <[email-masked]>
Date: Thu, 21 Mar 2019 10:53:16 -0400

> We also need to add libtool to makedepends for this.

I'll fix this.

> The test suite hangs for me here.

You also need the updated ust version I posted earlier with the
_SC_NPROCESSORS_CONF patch. If it still fails can you tell me which test
hangs or send me the logs.

I run the full test suite here in a VM with the virt kernel without issues.

> -nc

Regards,

Michael

---