[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.
This commit is contained in:
Ben Hutchings 2019-01-01 16:37:33 +00:00
parent 3f9bd54247
commit 46fcfa88d1
2 changed files with 9 additions and 2 deletions

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ linux (4.19.13-2) UNRELEASED; urgency=medium
[ John Paul Adrian Glaubitz ] [ John Paul Adrian Glaubitz ]
* [m68k] Add patch to build with -ffreestanding to fix FTBFS * [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 <glaubitz@physik.fu-berlin.de> Sun, 30 Dec 2018 10:30:57 +0100 -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Sun, 30 Dec 2018 10:30:57 +0100
linux (4.19.13-1) unstable; urgency=medium linux (4.19.13-1) unstable; urgency=medium

8
debian/rules.real vendored
View File

@ -105,8 +105,12 @@ ifneq ($(DO_TOOLS_VERSIONED),False)
endif endif
endif endif
ifneq ($(DO_TOOLS_UNVERSIONED),False) ifneq ($(DO_TOOLS_UNVERSIONED),False)
build-arch-arch:build-usbip build-cpupower build-liblockdep build-libbpf build-arch-arch: build-usbip build-cpupower build-liblockdep
binary-arch-arch: install-usbip install-cpupower install-liblockdep install-libbpf 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)),) ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),)
build-arch-arch: build-hyperv-daemons build-arch-arch: build-hyperv-daemons
binary-arch-arch: install-hyperv-daemons binary-arch-arch: install-hyperv-daemons