[bug#28673] [PATCH 5/6] gnu: libunwind: Merge update and test changes.

[Ludovic Courtès]

Dave Love <address@hidden> 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.patch
> @@ -0,0 +1,11 @@
> +--- libunwind-1.2.1/tests/Makefile.am~       1970-01-01 01:00:00.000000000 
> +0100
> ++++ libunwind-1.2.1/tests/Makefile.am        2017-09-06 13:32:52.331888031 
> +0100
> +@@ -97,7 +97,7 @@
> + XFAIL_TESTS =
> + 
> + if !ARCH_IA64
> +-XFAIL_TESTS += Gtest-dyn1 Ltest-dyn1
> ++XFAIL_TESTS += Gtest-dyn1 Ltest-dyn1 test-ptrace
> + endif
> + 
> + # Use if arch defines but does not support PTRACE_SINGLESTEP
> diff --git a/gnu/packages/patches/libunwind-ppc_lib64.patch 
> b/gnu/packages/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
> +===================================================================
> +--- 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 = xyes])
> + AC_MSG_RESULT([$use_dwarf])
> + 
> +-if test x$target_arch = xppc64; then
> +-        libdir='${exec_prefix}/lib64'
> +-        AC_MSG_NOTICE([PowerPC64 detected, lib will be installed 
> ${libdir}]);
> +-        AC_SUBST([libdir])
> +-fi

Could you avoid this patch and instead use ‘substitute*’ on ‘configure’
and ‘tests/Makefile.in’ such that we don’t need the extra dependency on
the autotools?

Please make sure to add a comment explaining why we’re doing this (the
Makefile.am bit is not obvious to me.)

TIA!

Ludo’.