Dpkg::BuildOptions: Really set DEB_BUILD_OPTIONS

Discovered by Daniel Shepler.

diff --git a/ChangeLog b/ChangeLog
index 35c322f4b5424ae1fe7bd827e73b387383b5a271..09eeaed86883d54a569d0ab6dd865335f41e0f3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        * scripts/Dpkg/BuildOptions.pm (parse): Add
        support for nocheck.
+       (set): Really set DEB_BUILD_OPTIONS. Discovered
+       by Daniel Shepler.
 
 2007-10-11  Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index 9975ab682407de677aea146cf5e1ef913ef00852..7b9cfec5ca7193adc226139f9c9bfe78d0ac4595 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ dpkg (1.14.8) UNRELEASED; urgency=low
     Closes: #382673
   * Various small fixes to the manpages suggested by Helge Kreutzmann.
     Closes: #445858
+  * Fix Dpkg::BuildOptions (and thereby dpkg-buildpackage) to really
+    set DEB_BUILD_OPTIONS. Found by Daniel Shepler. Closes: #446119
 
   [ Guillem Jover ]
   * Use shipped perl modules when calling perl programs at build time.

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index a28277d2564a3b5ae970980f6066df836ccee238..d94a0d362c525c6baa1dcbc52027c42d6b173714 100644 (file)
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -33,6 +33,8 @@ sub set {
            $env .= "$k,";
        }
     }
+
+    $ENV{DEB_BUILD_OPTIONS} = $env if $env;
 }
 
 1;