Merge ~zhsj/ubuntu/+source/dpkg:duplicated-lto-flags into ubuntu/+source/dpkg:ubuntu/devel

[Shengjing Zhu]

* Remove duplicated lto flags (LP: #2002201)
* Move lto-disabled hook to Dpkg::Vendor::Ubuntu

[Shengjing Zhu (zhsj)]

Uploaded to https://launchpad.net/~zhsj/+archive/ubuntu/lp-2002201 for testing.

[Shengjing Zhu (zhsj)]

Uploaded by costamagnagianfranco

diff --git a/debian/changelog b/debian/changelog
index 1cd4a3f..805c0e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpkg (1.21.17ubuntu2) lunar; urgency=medium
+
+  * Remove duplicated lto flags (LP: #2002201)
+  * Move lto-disabled hook to Dpkg::Vendor::Ubuntu
+
+ -- Shengjing Zhu <[e-mail]>  Mon, 09 Jan 2023 08:02:37 +0000
+
 dpkg (1.21.17ubuntu1) lunar; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 4c064a1..39ffbf0 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -26,7 +26,6 @@ use warnings;
 our $VERSION = '0.01';
 
 use Dpkg;
-use Dpkg::Arch;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Control::Types;
@@ -95,45 +94,6 @@ sub run_hook {
     }
 }
 
-sub _lto_disabled {
-    my $fn = "/usr/share/lto-disabled-list/lto-disabled-list";
-    open(LIST, "<", $fn) or return;
-
-    # get source name
-    -r "debian/control" or return;
-    require Dpkg::Control::Info;
-    my $ctrl = Dpkg::Control::Info->new();
-    my $src_fields = $ctrl->get_source();
-    return unless defined $src_fields;
-
-    my $src = "";
-    foreach (keys %{$src_fields}) {
-	my $v = $src_fields->{$_};
-        if (m/^Source$/i) {
-	    $src = $v;
-	    last;
-	}
-    }
-    return unless $src ne "";
-    
-    my $arch = Dpkg::Arch::get_host_arch();
-
-    # read disabled-list
-    while (<LIST>) {
-        if (m/^$src\s/) {
-	    if (m/^$src\s.*(any|$arch)\s/) {
-		close(LIST);
-		return 1;
-	    } else {
-		close(LIST);
-		return;
-	    }
-	}
-    }
-    close(LIST);
-    return;
-}
-
 sub set_build_features {
     my ($self, $flags) = @_;
 
@@ -173,21 +133,6 @@ sub set_build_features {
         },
     );
 
-    # no hook to set in Ubuntu.pm
-    require Dpkg::Arch;
-    my $arch = Dpkg::Arch::get_host_arch();
-
-    if (Dpkg::Arch::debarch_eq($arch, 'amd64')
-       or Dpkg::Arch::debarch_eq($arch, 'arm64')
-       or Dpkg::Arch::debarch_eq($arch, 'ppc64el')
-       or Dpkg::Arch::debarch_eq($arch, 's390x'))
-    {
-       $use_feature{optimize}{lto} = 1;
-       if (_lto_disabled()) {
-           $use_feature{optimize}{lto} = 0;
-        }
-    }
-
     my %builtin_feature = (
         hardening => {
             pie => 1,
@@ -207,6 +152,9 @@ sub set_build_features {
         $opts_maint->parse_features($area, $use_feature{$area});
     }
 
+    require Dpkg::Arch;
+
+    my $arch = Dpkg::Arch::get_host_arch();
     my ($abi, $libc, $os, $cpu) = Dpkg::Arch::debarch_to_debtuple($arch);
 
     unless (defined $abi and defined $libc and defined $os and defined $cpu) {
@@ -253,20 +201,6 @@ sub set_build_features {
         $flags->set_option_value('optimize-level', 2);
     }
 
-    ## Area: optimize
-
-    if ($use_feature{optimize}{lto}) {
-        my $ltoflag = '-flto=auto -ffat-lto-objects';
-        $flags->append('CFLAGS', $ltoflag);
-        $flags->append('CXXFLAGS', $ltoflag);
-        $flags->append('OBJCFLAGS', $ltoflag);
-        $flags->append('OBJCXXFLAGS', $ltoflag);
-        $flags->append('FFLAGS', $ltoflag);
-        $flags->append('FCFLAGS', $ltoflag);
-	
-        $flags->append('LDFLAGS', '-flto=auto');
-    }
-
     ## Area: sanitize
 
     # Handle logical feature interactions.
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index 6a8be91..e8cacc9 100644
--- a/scripts/Dpkg/Vendor/Ubuntu.pm
+++ b/scripts/Dpkg/Vendor/Ubuntu.pm
@@ -123,6 +123,46 @@ sub run_hook {
     }
 }
 
+sub _lto_disabled {
+    my $fn = "/usr/share/lto-disabled-list/lto-disabled-list";
+    open(LIST, "<", $fn) or return;
+
+    # get source name
+    -r "debian/control" or return;
+    require Dpkg::Control::Info;
+    my $ctrl = Dpkg::Control::Info->new();
+    my $src_fields = $ctrl->get_source();
+    return unless defined $src_fields;
+
+    my $src = "";
+    foreach (keys %{$src_fields}) {
+	my $v = $src_fields->{$_};
+        if (m/^Source$/i) {
+	    $src = $v;
+	    last;
+	}
+    }
+    return unless $src ne "";
+
+    require Dpkg::Arch;
+    my $arch = Dpkg::Arch::get_host_arch();
+
+    # read disabled-list
+    while (<LIST>) {
+        if (m/^$src\s/) {
+	    if (m/^$src\s.*(any|$arch)\s/) {
+		close(LIST);
+		return 1;
+	    } else {
+		close(LIST);
+		return;
+	    }
+	}
+    }
+    close(LIST);
+    return;
+}
+
 # Override Debian default features.
 sub set_build_features {
     my ($self, $flags) = @_;
@@ -134,6 +174,9 @@ sub set_build_features {
 
     if (any { $_ eq $arch } qw(amd64 arm64 ppc64el s390x)) {
         $flags->set_feature('optimize', 'lto', 1);
+       if (_lto_disabled()) {
+           $flags->set_feature('optimize', 'lto', 0);
+        }
     }
 
     if ($arch eq 'ppc64el' && $flags->get_option_value('optimize-level') != 0) {