From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz7k6-0007xL-Fo for guix-patches@gnu.org; Mon, 02 Oct 2017 16:55:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dz7k3-0001nR-R6 for guix-patches@gnu.org; Mon, 02 Oct 2017 16:55:10 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dz7k3-0001mq-N1 for guix-patches@gnu.org; Mon, 02 Oct 2017 16:55:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dz7k3-00060u-94 for guix-patches@gnu.org; Mon, 02 Oct 2017 16:55:07 -0400 Subject: [bug#28673] [PATCH 5/6] gnu: libunwind: Merge update and test changes. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz7iy-0007nK-Ub for guix-patches@gnu.org; Mon, 02 Oct 2017 16:54:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dz7ix-0007tA-Oa for guix-patches@gnu.org; Mon, 02 Oct 2017 16:54:00 -0400 From: Dave Love Date: Mon, 2 Oct 2017 21:48:47 +0100 Message-Id: <20171002204848.23646-5-fx@gnu.org> In-Reply-To: <20171002204848.23646-1-fx@gnu.org> References: <20171002204848.23646-1-fx@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 28673@debbugs.gnu.org Cc: Dave Love * 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. --- gnu/local.mk | 3 +++ gnu/packages/libunwind.scm | 22 ++++++++++++++++------ ...bunwind-known_test_failure_to_XFAIL_TESTS.patch | 11 +++++++++++ gnu/packages/patches/libunwind-ppc_lib64.patch | 17 +++++++++++++++++ 4 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/libunwind-known_test_failure_to_XFAIL_TESTS.patch create mode 100644 gnu/packages/patches/libunwind-ppc_lib64.patch diff --git a/gnu/local.mk b/gnu/local.mk index ed5346474..c80298a9c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -812,6 +812,8 @@ dist_patch_DATA = \ %D%/packages/patches/libtirpc-CVE-2017-8779.patch \ %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ + %D%/packages/patches/libunwind-known_test_failure_to_XFAIL_TESTS.patch \ + %D%/packages/patches/libunwind-ppc_lib64.patch \ %D%/packages/patches/libunistring-gnulib-multi-core.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ @@ -912,6 +914,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ + %D%/packages/patches/orangefs-ldshared.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm index e747d3778..370c433d7 100644 --- a/gnu/packages/libunwind.scm +++ b/gnu/packages/libunwind.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2017 Dave Love ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,8 @@ #:use-module (gnu packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (gnu packages autotools)) (define-public libunwind (package @@ -34,13 +36,21 @@ version ".tar.gz")) (sha256 (base32 - "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz")))) + "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz")) + (patches (search-patches + ;; (adapted) from Debian + "libunwind-known_test_failure_to_XFAIL_TESTS.patch" + "libunwind-ppc_lib64.patch")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (build-system gnu-build-system) (arguments - ;; FIXME: As of glibc 2.25, we get 1 out of 34 test failures (2 are - ;; expected to fail). - ;; Report them upstream. - '(#:tests? #f)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vif"))))))) (home-page "http://www.nongnu.org/libunwind") (synopsis "Determining the call chain of a program") (description diff --git a/gnu/packages/patches/libunwind-known_test_failure_to_XFAIL_TESTS.patch b/gnu/packages/patches/libunwind-known_test_failure_to_XFAIL_TESTS.patch new file mode 100644 index 000000000..44ba44892 --- /dev/null +++ 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 +- + AC_MSG_CHECKING([whether to restrict build to remote support]) + if test x$target_arch != x$host_arch; then + CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY" -- 2.11.0