Merge lp:~vorlon/ubuntu/trusty/dpkg/lp.1279128 into lp:ubuntu/trusty/dpkg

[Steve Langasek]

proposed fix for bug #1279128, please review

[Adam Conrad (adconrad)]

Fixed differently in an archive upload.

Unmerged revisions

202. By Steve Langasek on 2014-02-12

Set the default optimization in dpkg-buildflags to -O3 on ppc64 and
ppc64el, instead of -O2. LP: #1279128.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-05 07:26:29 +0000
+++ debian/changelog	2014-02-12 00:39:55 +0000
@@ -1,3 +1,10 @@
+dpkg (1.17.5ubuntu4) UNRELEASED; urgency=medium
+
+  * Set the default optimization in dpkg-buildflags to -O3 on ppc64 and 
+    ppc64el, instead of -O2.  LP: #1279128.
+
+ -- Steve Langasek <[e-mail]>  Wed, 12 Feb 2014 00:37:02 +0000
+
 dpkg (1.17.5ubuntu3) trusty; urgency=medium
 
   * Change native source version/format mismatch errors into warnings until

=== modified file 'scripts/Dpkg/BuildFlags.pm'
--- scripts/Dpkg/BuildFlags.pm	2013-12-07 07:34:54 +0000
+++ scripts/Dpkg/BuildFlags.pm	2014-02-12 00:39:55 +0000
@@ -25,6 +25,7 @@
 use Dpkg::BuildEnv;
 use Dpkg::BuildOptions;
 use Dpkg::ErrorHandling;
+use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Vendor qw(run_vendor_hook);
 
 =encoding utf8
@@ -74,6 +75,10 @@
     my $build_opts = Dpkg::BuildOptions->new();
     $self->{build_options} = $build_opts;
     my $default_flags = $build_opts->has('noopt') ? '-g -O0' : '-g -O2';
+    my $arch = get_host_arch();
+    if ($arch eq 'ppc64' || $arch eq 'ppc64el') {
+        $default_flags = $build_opts->has('noopt') ? '-g -O0' : '-g -O3';
+    }
     $self->{flags} = {
 	CPPFLAGS => '',
 	CFLAGS   => $default_flags,