From 03390670e360b53ec5ffb20696aba29d6a8eeec8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 5 Jun 2011 22:34:36 +0000 Subject: [PATCH] perf: Cancel -Werror compiler option; fixes FTBFS with perl 5.14 svn path=/dists/trunk/linux-2.6/; revision=17601 --- debian/changelog | 3 +++ debian/rules.real | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 403314f3d..7a91b5955 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ linux-2.6 (3.0.0~rc1-1~experimental.2) UNRELEASED; urgency=low [ Aurelien Jarno ] * [mips,mipsel] Update arch/mips/kernel/i8259.c to fix FTBFS. + [ Ben Hutchings ] + * perf: Cancel -Werror compiler option; fixes FTBFS with perl 5.14 + -- Ben Hutchings Wed, 01 Jun 2011 06:41:14 +0100 linux-2.6 (3.0.0~rc1-1~experimental.1) experimental; urgency=low diff --git a/debian/rules.real b/debian/rules.real index 3492e7152..7434fe373 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -32,7 +32,7 @@ setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER) DIS MAKE_CLEAN = $(setup_env) $(MAKE) MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES) MAKEOVERRIDES = -MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(DEB_BUILD_ARCH) +MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(DEB_BUILD_ARCH) EXTRA_WARNINGS=-Wno-error # # Targets