The following commit has been merged in the sid branch:
commit 128ece24446b5e7a701f94d9bdcc4c6a3c8410e3
Author: Raphaël Hertzog <[email protected]>
Date: Sun Oct 2 09:44:14 2011 +0200
dpkg-buildpackage: no longer output the build flags
Because dpkg-buildpackage is no longer setting the corresponding
environment variables, and because it confuses maintainers
who are overriding them via debian/rules and who are not seeing
the expected values in their build log.
diff --git a/debian/changelog b/debian/changelog
index 7ef29f9..6554462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ dpkg (1.16.1.1) UNRELEASED; urgency=low
* Fix dpkg-buildflags --dump to return 0 as exit code and not 1.
* Update dpkg-buildflags(1) to not include quotes in the examples
setting DEB_BUILD_MAINT_OPTIONS.
+ * Stop outputting build flags in dpkg-buildpackage as it confuses
+ maintainers who are overriding them in debian/rules and who
+ are not seeing the expected value in the build log.
[ Guillem Jover ]
* Change dpkg-buildflags to set preprocessor option -D_FORTIFY_SOURCE=2
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 40efa0c..50e6170 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -25,7 +25,6 @@ use POSIX;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
-use Dpkg::BuildFlags;
use Dpkg::BuildOptions;
use Dpkg::Compression;
use Dpkg::Version;
@@ -294,13 +293,6 @@ if (defined $parallel) {
$build_opts->export();
}
-my $build_flags = Dpkg::BuildFlags->new();
-$build_flags->load_config();
-foreach my $flag ($build_flags->list()) {
- printf(_g("%s: dpkg-buildflags (origin: %s): %s = %s\n"), $progname,
- $build_flags->get_origin($flag), $flag, $build_flags->get($flag));
-}
-
my $cwd = cwd();
my $dir = basename($cwd);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
