From 46fcfa88d1f657304af4eff9ed65b241147304f2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 1 Jan 2019 16:37:33 +0000 Subject: [PATCH] [ia64,m68k] libbpf: Really don't build on architectures without perf events The architecture filtering needs to be done in debian/rules.real as well. --- debian/changelog | 3 +++ debian/rules.real | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b9a46446e..0efeb0044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ linux (4.19.13-2) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * [m68k] Add patch to build with -ffreestanding to fix FTBFS + [ Ben Hutchings ] + * [ia64,m68k] libbpf: Really don't build on architectures without perf events + -- John Paul Adrian Glaubitz Sun, 30 Dec 2018 10:30:57 +0100 linux (4.19.13-1) unstable; urgency=medium diff --git a/debian/rules.real b/debian/rules.real index ce909d7e0..49c40555e 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -105,8 +105,12 @@ ifneq ($(DO_TOOLS_VERSIONED),False) endif endif ifneq ($(DO_TOOLS_UNVERSIONED),False) - build-arch-arch:build-usbip build-cpupower build-liblockdep build-libbpf - binary-arch-arch: install-usbip install-cpupower install-liblockdep install-libbpf + build-arch-arch: build-usbip build-cpupower build-liblockdep + binary-arch-arch: install-usbip install-cpupower install-liblockdep + ifneq ($(filter alpha amd64 arm64 arm64ilp32 armel armhf hppa i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc powerpcspe ppc64 ppc64el riscv64 s390 s390x sh3 sh4 sparc sparc64 x32,$(DEB_HOST_ARCH)),) + build-arch-arch: build-libbpf + binary-arch-arch: install-libbpf + endif ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),) build-arch-arch: build-hyperv-daemons binary-arch-arch: install-hyperv-daemons