Merge ~liushuyu-011/ubuntu/+source/dpkg:ubuntu/noble-devel into ubuntu/+source/dpkg:ubuntu/noble-devel

[Zixing Liu]

This merge proposal backports the frame-pointer enablement logic to Noble for Rust toolchains.

[Benjamin Drung (bdrung)]

There is no bug reference in d/changelog and 1.22.6ubuntu6.2 would be a more consistent choice.

review: Needs Fixing

[Zixing Liu (liushuyu-011)]

> There is no bug reference in d/changelog and 1.22.6ubuntu6.2 would be a more consistent choice.

Done now

[Benjamin Drung (bdrung)]

The documentation mentions 1.22.6ubuntu12 a lot, but since that is part of the SRU 1.22.6ubuntu6.2 should probably mentioned as well, shouldn't it?

55afb53... by Zixing Liu on 2024-10-09

replaces mainline version number 1.22.6ubuntu12 with 1.22.6ubuntu6.2

in the documentation

[Zixing Liu (liushuyu-011)]

> The documentation mentions 1.22.6ubuntu12 a lot, but since that is part of the SRU 1.22.6ubuntu6.2 should probably mentioned as well, shouldn't it?

Version numbers replaced.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 9d5169b..6bc9a1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dpkg (1.22.6ubuntu6.2) noble; urgency=medium
+
+  [ Zixing Liu ]
+  * Add RUSTFLAGS to define frame pointers for Rust toolchain (LP: #2082636).
+  * Replaces mainline version number 1.22.6ubuntu12 with 1.22.6ubuntu6.2 in
+    the documentation to avoid confusion with backported version.
+
+  [ Benjamin Drung ]
+  * buildflags: document RUSTFLAGS
+  * buildflags: Always set RUSTFLAGS
+
+ -- Zixing Liu <[e-mail]>  Thu, 26 Sep 2024 13:14:01 -0600
+
 dpkg (1.22.6ubuntu6.1) noble-security; urgency=medium
 
   * SRU:
diff --git a/man/dpkg-buildflags.pod b/man/dpkg-buildflags.pod
index af2198d..72bb0ab 100644
--- a/man/dpkg-buildflags.pod
+++ b/man/dpkg-buildflags.pod
@@ -319,6 +319,11 @@ Options for the host Fortran 9x compiler.
 Same as B<FFLAGS>.
 Since dpkg 1.17.7.
 
+=item B<RUSTFLAGS>
+
+Options for the host Rust compiler (rustc).
+Since dpkg 1.22.6ubuntu6.2.
+
 =item B<LDFLAGS>
 
 Options passed to the host compiler when linking executables or shared
@@ -392,6 +397,11 @@ be stripped from these options).
 Default value: empty.
 Since dpkg 1.22.1.
 
+=item B<RUSTFLAGS_FOR_BUILD>
+
+Options for the build Rust compiler (rustc).
+Since dpkg 1.22.6ubuntu6.2.
+
 =back
 
 New flags might be added in the future if the need arises (for example
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index 8aff53e..ba01c25 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -94,6 +94,8 @@ sub _init_vendor_defaults {
         FCFLAGS_FOR_BUILD
         LDFLAGS
         LDFLAGS_FOR_BUILD
+        RUSTFLAGS
+        RUSTFLAGS_FOR_BUILD
     );
 
     $self->{features} = {};
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index 383d5cc..ca0c531 100644
--- a/scripts/Dpkg/Vendor/Ubuntu.pm
+++ b/scripts/Dpkg/Vendor/Ubuntu.pm
@@ -215,6 +215,19 @@ sub add_build_flags {
     # Per https://wiki.ubuntu.com/DistCompilerFlags
     $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions');
 
+    # Add Rust flags
+    $flags->append('RUSTFLAGS', '');
+    $flags->append('RUSTFLAGS_FOR_BUILD', '');
+    # Rust frame pointer switch
+    if ($flags->use_feature('qa', 'framepointer')) {
+        my $arch = Dpkg::Arch::get_host_arch();
+        if (Dpkg::Arch::debarch_eq($arch, 's390x')) {
+            $flags->append('RUSTFLAGS', '-Ctarget-feature=+backchain');
+        } else {
+            $flags->append('RUSTFLAGS', '-Cforce-frame-pointers=yes');
+        }
+    }
+
     # In Ubuntu these flags are set by the compiler, so when disabling the
     # features we need to pass appropriate flags to disable them.
     if (!$flags->use_feature('hardening', 'stackprotectorstrong') &&
diff --git a/scripts/mk/buildflags.mk b/scripts/mk/buildflags.mk
index 6d9bacd..deb0d5f 100644
--- a/scripts/mk/buildflags.mk
+++ b/scripts/mk/buildflags.mk
@@ -11,6 +11,7 @@
 #   FFLAGS: flags for the host Fortran 77 compiler.
 #   FCFLAGS: flags for the host Fortran 9x compiler.
 #   LDFLAGS: flags for the host linker.
+#   RUSTFLAGS: flags for the host Rust compiler (since 1.22.6ubuntu6.2).
 #
 # And the following variables for the build tools (since dpkg 1.22.1):
 #
@@ -24,6 +25,7 @@
 #   FFLAGS_FOR_BUILD: flags for the build Fortran 77 compiler.
 #   FCFLAGS_FOR_BUILD: flags for the build Fortran 9x compiler.
 #   LDFLAGS_FOR_BUILD: flags for the build linker.
+#   RUSTFLAGS_FOR_BUILD: flags for the build Rust compiler (since 1.22.6ubuntu6.2).
 #
 # You can also export them in the environment by setting
 # DPKG_EXPORT_BUILDFLAGS to a non-empty value.
@@ -54,6 +56,8 @@ DPKG_BUILDFLAGS_LIST = \
   FCFLAGS_FOR_BUILD \
   LDFLAGS \
   LDFLAGS_FOR_BUILD \
+  RUSTFLAGS \
+  RUSTFLAGS_FOR_BUILD \
   # EOL
 
 define dpkg_buildflags_export_envvar
diff --git a/scripts/t/mk/buildflags.mk b/scripts/t/mk/buildflags.mk
index 94d85a7..ca321b9 100644
--- a/scripts/t/mk/buildflags.mk
+++ b/scripts/t/mk/buildflags.mk
@@ -24,3 +24,5 @@ test:
 	test "$(OBJCFLAGS_FOR_BUILD)" = "$(TEST_OBJCFLAGS_FOR_BUILD)"
 	test "$(OBJCXXFLAGS)" = "$(TEST_OBJCXXFLAGS)"
 	test "$(OBJCXXFLAGS_FOR_BUILD)" = "$(TEST_OBJCXXFLAGS_FOR_BUILD)"
+	test "$(RUSTFLAGS)" = "$(TEST_RUSTFLAGS)"
+	test "$(RUSTFLAGS_FOR_BUILD)" = "$(TEST_RUSTFLAGS_FOR_BUILD)"