Use libdw-based unwinder in ci and packages

* ci/install-dependencies.sh (common_packages): Add pkg-config,
replace libunwind8-dev with libdw-dev.
* debian/control (Build-Depends) [amd64]: Add pkg-config,
replace libunwind-dev with libdw-dev.
* debian/rules (build-udeb/Makefile): Replace --without-libunwind
with --without-stacktrace.
* strace.spec.in (buildrequires_libunwind_devel): Rename
to buildrequires_stacktrace, replace libunwind-devel with
either elfutils-devel or libdw-devel.

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 8ce5df341e98d857a2be5f517ec63f1b45ff5b34..75cbaf6d34616221db07d284b00e0693a45994ee 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -ex
 
 type sudo >/dev/null 2>&1 && sudo=sudo || sudo=
-common_packages='autoconf automake faketime file gawk gcc-multilib git gzip libunwind8-dev make xz-utils'
+common_packages='autoconf automake faketime file gawk gcc-multilib git gzip libdw-dev make pkg-config xz-utils'
 
 updated=
 apt_get_install()

diff --git a/debian/control b/debian/control
index 0c4ae1537a7b5dd132461b092a0a07da71fceedb..af7e88722f6632266ae667d805f0cd5e1f02d72c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: strace
 Maintainer: Steve McIntyre <93sam@debian.org>
 Section: utils
 Priority: optional
-Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [amd64 i386 powerpc ppc64 ppc64el s390 s390x sparc sparc64 x32], debhelper (>= 7.0.0), gawk, libunwind-dev [amd64], libiberty-dev [amd64], libbluetooth-dev
+Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [amd64 i386 powerpc ppc64 ppc64el s390 s390x sparc sparc64 x32], debhelper (>= 7.0.0), gawk, pkg-config [amd64], libdw-dev [amd64], libiberty-dev [amd64], libbluetooth-dev
 Standards-Version: 4.1.3
 Homepage: https://strace.io
 Vcs-Git: https://salsa.debian.org/debian/strace.git

diff --git a/debian/rules b/debian/rules
index f335fedfe1ed7459a7514065e371dc197453936c..b22767acf04683c3ac915f8c1da438a1ab2c9b82 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ build/Makefile: configure
 build-udeb/Makefile: configure
        mkdir -p $(@D)
        cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr \
-               --without-libunwind --without-libiberty $(CONFIG_OPTS)
+               --without-stacktrace --without-libiberty $(CONFIG_OPTS)
 
 build64/Makefile: configure
        mkdir -p $(@D)

diff --git a/strace.spec.in b/strace.spec.in
index 18446ee51481184a8a6f08e47fca315fca1978bb..5f4e3e086e3b152b7e41122898e9bf93009434d0 100644 (file)
--- a/strace.spec.in
+++ b/strace.spec.in
@@ -10,12 +10,15 @@ BuildRequires: gcc
 %if 0%{?fedora} >= 18 || 0%{?centos} >= 8 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1200
 BuildRequires: pkgconfig(bluez)
 %endif
-%if 0%{?fedora} >= 20 || 0%{?centos} >= 8 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1300
-%define buildrequires_libunwind_devel BuildRequires: libunwind-devel binutils-devel
+%if 0%{?fedora} >= 20 || 0%{?centos} >= 6 || 0%{?rhel} >= 6
+%define buildrequires_stacktrace BuildRequires: elfutils-devel binutils-devel
+%endif
+%if 0%{?suse_version} >= 1100
+%define buildrequires_stacktrace BuildRequires: libdw-devel binutils-devel
 %endif
 %ifarch x86_64
 # for experimental -k option
-%{?buildrequires_libunwind_devel}
+%{?buildrequires_stacktrace}
 %endif
 %define strace64_arches ppc64 sparc64
 %{?!buildroot:BuildRoot: %_tmppath/buildroot-%name-%version-%release}