diff options
author | Joey Hess <joey@kitenet.net> | 2011-08-06 18:58:55 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-08-06 18:59:43 -0400 |
commit | cf88cb54bfc44e8a48eacc3bd6e852d7413780f7 (patch) | |
tree | bddad8228594bd46cc870dc4596ac60a4976f75c /Debian | |
parent | 3d2a36e2957745d9be7d8ce978eaf3ac2edd29d2 (diff) |
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)
Diffstat (limited to 'Debian')
-rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 3 |
1 files changed, 1 insertions, 2 deletions
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"; |