From 49db810924684ce433a9b6f1bbc2b14bbd3880cd Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 6 Jul 2018 05:19:28 +0100 Subject: [PATCH] linux-perf: Disable building for powerpcspe James Clarke had a go at fixing it but hasn't succeeded yet. --- debian/changelog | 1 + debian/rules.d/tools/perf/Makefile | 5 ++++- debian/rules.real | 2 +- debian/templates/control.tools-versioned.in | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a865197b5..d5b0b9997 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (4.17.3-2) UNRELEASED; urgency=medium * [powerpcspe] Fix build failures (thanks to James Clarke): - powerpc/lib/sstep: Fix building for powerpcspe - powerpc/lib/Makefile: Don't pull in quad.o for 32-bit kernels + - linux-perf: Disable building for powerpcspe -- Sjoerd Simons Wed, 04 Jul 2018 10:25:57 +0200 diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index ec0c9e974..40c331fdd 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -15,7 +15,10 @@ else ifneq ($(filter mips%,$(DEB_HOST_ARCH_CPU)),) else ifeq ($(DEB_HOST_ARCH_CPU),hppa) KERNEL_ARCH_PERF = parisc else ifneq ($(filter powerpc% ppc%,$(DEB_HOST_ARCH_CPU)),) - KERNEL_ARCH_PERF = powerpc + # But pure 32-bit toolchains currently don't work + ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),powerpcspe) + KERNEL_ARCH_PERF = powerpc + endif else ifneq ($(filter s390%,$(DEB_HOST_ARCH_CPU)),) KERNEL_ARCH_PERF = s390 else ifeq ($(DEB_HOST_ARCH_CPU),sh4) diff --git a/debian/rules.real b/debian/rules.real index d7524f469..746d08ace 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -80,7 +80,7 @@ binary-indep: install-support ifneq ($(DO_TOOLS_VERSIONED),False) build-arch-arch: $(STAMPS_DIR)/build-tools binary-arch-arch: install-kbuild - ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),) + ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_HOST_ARCH)),) ifeq ($(filter nopython,$(DEB_BUILD_PROFILES)),) binary-arch-arch: install-perf endif diff --git a/debian/templates/control.tools-versioned.in b/debian/templates/control.tools-versioned.in index 9bef406a1..e104dacf8 100644 --- a/debian/templates/control.tools-versioned.in +++ b/debian/templates/control.tools-versioned.in @@ -9,7 +9,7 @@ Description: Kbuild infrastructure for Linux @version@ Package: linux-perf-@version@ Build-Profiles: Section: devel -Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 +Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends} Recommends: linux-base Provides: linux-tools-@version@