From cf88cb54bfc44e8a48eacc3bd6e852d7413780f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Aug 2011 18:58:55 -0400 Subject: dpkg-buildflags is only used to set environment in v9 To avoid re-breaking packages that were already broken a first time by dpkg-buildpackage unconditionally setting the environment, and unbroke it by unsetting variables in the rules file. (Example: numpy) --- Debian/Debhelper/Dh_Lib.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Debian/Debhelper/Dh_Lib.pm') diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 174970b0..5a7c3e4a 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -903,8 +903,7 @@ sub cross_command { # Sets environment variables from dpkg-buildflags. Avoids changing # any existing environment variables. sub set_buildflags { - # optimisation - return if $ENV{DH_INTERNAL_BUILDFLAGS}; + return if $ENV{DH_INTERNAL_BUILDFLAGS} || compat(8); $ENV{DH_INTERNAL_BUILDFLAGS}=1; eval "use Dpkg::BuildFlags"; -- cgit v1.2.3