From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzOTT-0006sk-3N for guix-patches@gnu.org; Tue, 03 Oct 2017 10:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzOTO-0003Su-Tj for guix-patches@gnu.org; Tue, 03 Oct 2017 10:47:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzOTO-0003Se-Pz for guix-patches@gnu.org; Tue, 03 Oct 2017 10:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dzOTO-0005My-Gx for guix-patches@gnu.org; Tue, 03 Oct 2017 10:47:02 -0400 Subject: [bug#28673] [PATCH 5/6] gnu: libunwind: Merge update and test changes. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20171002204848.23646-1-fx@gnu.org> <20171002204848.23646-5-fx@gnu.org> Date: Tue, 03 Oct 2017 16:46:20 +0200 In-Reply-To: <20171002204848.23646-5-fx@gnu.org> (Dave Love's message of "Mon, 2 Oct 2017 21:48:47 +0100") Message-ID: <87vajw47cz.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Dave Love Cc: 28673@debbugs.gnu.org Dave Love skribis: > * gnu/packages/patches/libunwind-known_test_failure_to_XFAIL_TESTS.patch: > New file. > * gnu/packages/patches/libunwind-ppc_lib64.patch: New file. > * gnu/packages/libunwind.scm (libunwind)[source]: Use them. > (libunwind)(native-inputs): Add autotools. > (libunwind)(arguments): Enable tests; run autoreconf. > * gnu/local.mk: Update dependencies. [...] > +++ b/gnu/packages/patches/libunwind-known_test_failure_to_XFAIL_TESTS.pa= tch > @@ -0,0 +1,11 @@ > +--- libunwind-1.2.1/tests/Makefile.am~ 1970-01-01 01:00:00.000000000 +01= 00 > ++++ libunwind-1.2.1/tests/Makefile.am 2017-09-06 13:32:52.331888031 +0100 > +@@ -97,7 +97,7 @@ > + XFAIL_TESTS =3D > +=20 > + if !ARCH_IA64 > +-XFAIL_TESTS +=3D Gtest-dyn1 Ltest-dyn1 > ++XFAIL_TESTS +=3D Gtest-dyn1 Ltest-dyn1 test-ptrace > + endif > +=20 > + # Use if arch defines but does not support PTRACE_SINGLESTEP > diff --git a/gnu/packages/patches/libunwind-ppc_lib64.patch b/gnu/package= s/patches/libunwind-ppc_lib64.patch > new file mode 100644 > index 000000000..9ab0108ae > --- /dev/null > +++ b/gnu/packages/patches/libunwind-ppc_lib64.patch > @@ -0,0 +1,17 @@ > +Index: pkg-libunwind/configure.ac > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > +--- pkg-libunwind.orig/configure.ac 2014-05-07 15:13:28.247711669 +0900 > ++++ pkg-libunwind/configure.ac 2014-05-07 15:14:25.924958386 +0900 > +@@ -164,12 +164,6 @@ > + AM_CONDITIONAL(USE_DWARF, [test x$use_dwarf =3D xyes]) > + AC_MSG_RESULT([$use_dwarf]) > +=20 > +-if test x$target_arch =3D xppc64; then > +- libdir=3D'${exec_prefix}/lib64' > +- AC_MSG_NOTICE([PowerPC64 detected, lib will be installed ${libd= ir}]); > +- AC_SUBST([libdir]) > +-fi Could you avoid this patch and instead use =E2=80=98substitute*=E2=80=99 on= =E2=80=98configure=E2=80=99 and =E2=80=98tests/Makefile.in=E2=80=99 such that we don=E2=80=99t need the= extra dependency on the autotools? Please make sure to add a comment explaining why we=E2=80=99re doing this (= the Makefile.am bit is not obvious to me.) TIA! Ludo=E2=80=99.