From 66c1739d86b9e2cbe3d4189852a618e839dd3573 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 12 Feb 2018 18:28:16 +0000 Subject: [PATCH] debian: build strace-udeb separately * debian/rules (extra_build_targets): Add build-udeb-stamp. (build-udeb/Makefile): New rule. (clean): Remove build-udeb. * debian/strace-udeb.install: Update. Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826223 --- debian/rules | 9 ++++++++- debian/strace-udeb.install | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 735a5181..2ba864bf 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,8 @@ DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +extra_build_targets += build-udeb-stamp + arch64_map = i386=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x ifneq (,$(filter $(DEB_HOST_ARCH)=%, $(arch64_map))) HOST64 = $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \ @@ -56,6 +58,11 @@ build/Makefile: mkdir -p $(@D) cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr $(CONFIG_OPTS) +build-udeb/Makefile: + mkdir -p $(@D) + cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr \ + --without-libunwind --without-libiberty $(CONFIG_OPTS) + build64/Makefile: mkdir -p $(@D) cd $(@D); CC="$(CC64)" sh ../configure --enable-mpers=check --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(HOST64) @@ -63,7 +70,7 @@ build64/Makefile: clean: dh_testdir dh_testroot - rm -rf build build64 strace64.1 debian/strace64.substvars + rm -rf build build-udeb build64 strace64.1 debian/strace64.substvars dh_clean binary: binary-indep binary-arch diff --git a/debian/strace-udeb.install b/debian/strace-udeb.install index 1f419282..d823419a 100644 --- a/debian/strace-udeb.install +++ b/debian/strace-udeb.install @@ -1 +1 @@ -build/strace usr/bin +build-udeb/strace usr/bin -- 2.40.0