From: Frank Lichtenheld <djpig@debian.org>
Date: Thu, 11 Oct 2007 22:43:31 +0000 (+0200)
Subject: Dpkg::BuildOptions: Really set DEB_BUILD_OPTIONS
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e6845caaab4af4c860258b55a9a1fb92496438b;p=dpkg

Dpkg::BuildOptions: Really set DEB_BUILD_OPTIONS

Discovered by Daniel Shepler.
---

diff --git a/ChangeLog b/ChangeLog
index 35c322f4..09eeaed8 100644
--- 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 9975ab68..7b9cfec5 100644
--- 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 a28277d2..d94a0d36 100644
--- 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;