From: Michael Jeanson <mjeanson@efficios.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Michael Jeanson <mjeanson@efficios.com>
Subject: [alpine-aports] [PATCH v2] testing/lttng-tools: upgrade to 2.10.6
Date: Thu, 28 Mar 2019 11:10:56 -0500
Message-Id: <20190328161056.17357-1-mjeanson@efficios.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

---
 ...db67743d08f418235fee43747bb9d42d62ce.patch | 29 +++++++++++++++++++
 testing/lttng-tools/APKBUILD                  | 25 +++++++++-------
 2 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 testing/lttng-tools/9193db67743d08f418235fee43747bb9d=
42d62ce.patch

diff --git a/testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce=
.patch b/testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.pat=
ch
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 <mjeanson@efficios.com>
+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 <mjeanson@efficios.com>
+---
+ 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/reg=
ression/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 =3D -module -shared -avoid-v=
ersion \
+ 			   -rpath $(abs_builddir)
+=20
+ libpause_consumer_la_SOURCES =3D consumer_testpoints.c
+-libpause_consumer_la_LIBADD =3D $(top_builddir)/src/common/libcommon.la=
 $(DL_LIBS)
++libpause_consumer_la_LIBADD =3D \
++	$(top_builddir)/src/common/libcommon.la \
++	$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
++	$(DL_LIBS)
+ libpause_consumer_la_LDFLAGS =3D $(FORCE_SHARED_LIB_OPTIONS)
+ noinst_LTLIBRARIES =3D libpause_consumer.la
+=20
diff --git a/testing/lttng-tools/APKBUILD b/testing/lttng-tools/APKBUILD
index 08e344eae6..37325ab24f 100644
--- a/testing/lttng-tools/APKBUILD
+++ b/testing/lttng-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Jeanson <mjeanson@efficios.com>
 # Maintainer: Michael Jeanson <mjeanson@efficios.com>
 pkgname=3Dlttng-tools
-pkgver=3D2.9.6
+pkgver=3D2.10.6
 pkgrel=3D0
 pkgdesc=3D"LTTng 2.0 control and utility programs"
 url=3D"https://lttng.org"
@@ -10,11 +10,11 @@ license=3D"GPL-2.0"
 depends=3D"babeltrace"
 depends_dev=3D"popt-dev libxml2-dev userspace-rcu-dev lttng-ust-dev kmod=
-dev
 	util-linux-dev"
-makedepends=3D"$depends_dev bash grep coreutils automake autoconf"
+makedepends=3D"$depends_dev bash grep coreutils automake autoconf libtoo=
l"
 install=3D""
 subpackages=3D"$pkgname-dev $pkgname-doc"
 source=3D"https://lttng.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
-	musl-has-no-dlmopen.patch"
+	9193db67743d08f418235fee43747bb9d42d62ce.patch"
=20
 builddir=3D"$srcdir/$pkgname-$pkgver"
=20
@@ -22,25 +22,30 @@ build() {
 	cd "$builddir"
=20
 	unset LDFLAGS
+	autoreconf -i # Because we patch a Makefile.am
 	./configure \
 		--build=3D$CBUILD \
 		--host=3D$CHOST \
 		--prefix=3D/usr \
 		--sysconfdir=3D/etc \
-		--localstatedir=3D/var \
-		|| return 1
-	make V=3D1 || return 1
-	make -j1 check || return 1
+		--localstatedir=3D/var
+	make V=3D1
+}
+
+check() {
+	cd "$builddir"
+
+	make -j1 check
 }
=20
 package() {
 	cd "$builddir"
=20
-	make DESTDIR=3D"$pkgdir" install || return 1
+	make DESTDIR=3D"$pkgdir" install
 	mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
 	mv "$pkgdir"/usr/share/doc/$pkgname/LICENSE \
 		"$pkgdir"/usr/share/licenses/$pkgname/
 }
=20
-sha512sums=3D"5fc9da4280587c4dc3c695f713e3ae51ad46a9bd0c82d4241a95f406e2=
644ef296d46c507171b7adc549a933f3abc64c993106287a84a0b8c6901b3b122a0646  l=
ttng-tools-2.9.6.tar.bz2
-cb5136007b0d8ea0a84557ab025e709dc4c5d818272f057a9f6c78ed7cf5104b9d904a1b=
8c5e8674e3455fe85dc28bb890c190cc04f0c1d9c29d87b40dadb88b  musl-has-no-dlm=
open.patch"
+sha512sums=3D"d33379687755b1c97036d69abcf778278adc099e8c44f94b1f1c610011=
bf8f0da66a2743f39cb9798c72a2e6218bb31c4d392ff4269dbf0d6a694294458f231d  l=
ttng-tools-2.10.6.tar.bz2
+63fa29f2f6ee7065cc8c44663428ecf2b8c1d4557214e6aa04a863168f73bbe532f2ee7d=
55fc23a30fda1ab03c4434b857f3778a7807eba573e01959b2288ac9  9193db67743d08f=
418235fee43747bb9d42d62ce.patch"
--=20
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---