Просмотр исходного кода

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.
Raphaël Hertzog лет назад: 14
Родитель
Сommit
128ece2444
2 измененных файлов с 3 добавлено и 8 удалено
  1. 3 0
      debian/changelog
  2. 0 8
      scripts/dpkg-buildpackage.pl

+ 3 - 0
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

+ 0 - 8
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);