debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

[x32] Don't attempt to build linux-perf (fixes FTBFS)

This commit is contained in:
Ben Hutchings 2015-09-29 14:12:43 +01:00
parent 755c6a0307
commit 98517d1ea6
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/build/tools/perf/Makefile vendored
View File

@ -23,7 +23,10 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sh4)
else ifneq ($(filter sparc%,$(DEB_HOST_ARCH_CPU)),)
KERNEL_ARCH_PERF = sparc
else ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH_CPU)),)
KERNEL_ARCH_PERF = x86
# But x32 isn't supported yet
ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),x32)
KERNEL_ARCH_PERF = x86
endif
endif
MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error EXTRA_CFLAGS='$(CFLAGS) $(CPPFLAGS)' LDFLAGS='$(LDFLAGS)'

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
linux-tools (4.2-2) UNRELEASED; urgency=medium
* [x32] Don't attempt to build linux-perf (fixes FTBFS)
-- Ben Hutchings <ben@decadent.org.uk> Tue, 29 Sep 2015 04:50:43 +0100
linux-tools (4.2-1) unstable; urgency=medium
* New upstream release

2
debian/rules.real vendored
View File

@ -4,7 +4,7 @@ export KBUILD_BUILD_TIMESTAMP := $(shell dpkg-parsechangelog | sed -ne 's,^Date:
include debian/rules.defs
binary-arch: install-kbuild install-usbip install-lockdep
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32,$(DEB_BUILD_ARCH)),)
ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
binary-arch: install-perf
endif
ifneq ($(filter i386 amd64,$(DEB_BUILD_ARCH)),)

2
debian/templates/control.main.in vendored
View File

@ -7,7 +7,7 @@ Description: Kbuild infrastructure for Linux @version@
Package: linux-perf-@version@
Section: devel
Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32
Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
Recommends: linux-base (>= 3.4~)
Provides: linux-tools-@version@