[neon/qt6/qbs/Neon/release] debian: Switch from -O3 to -O2 on Ubuntu amd64 to work around the FTBFS.

[Dmitry Shachnev]

Git commit d33fbad57155b9c24a24e97e466e013a5f512723 by Dmitry Shachnev, on behalf of Simon Quigley.
Committed on 19/03/2025 at 19:14.
Pushed by carlosdem into branch 'Neon/release'.

Switch from -O3 to -O2 on Ubuntu amd64 to work around the FTBFS.

M  +2    -0    debian/changelog
M  +1    -1    debian/rules

https://invent.kde.org/neon/qt6/qbs/-/commit/d33fbad57155b9c24a24e97e466e013a5f512723

diff --git a/debian/changelog b/debian/changelog
index a0d90e4..dd0e09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (2.5.1-2) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
+  * Extend the -O2 hack for Ubuntu to also apply to amd64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 19 Mar 2025 22:12:11 +0300
 
diff --git a/debian/rules b/debian/rules
index 15c04df..baa571f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export QTEST_FUNCTION_TIMEOUT=900000
 endif
 
 ifeq ($(call dpkg_vendor_derives_from,ubuntu),yes)
-ifeq (ppc64el,$(DEB_HOST_ARCH))
+ifneq ($(filter $(DEB_HOST_ARCH),ppc64el amd64),)
 export DEB_CXXFLAGS_MAINT_STRIP=-O3
 export DEB_CXXFLAGS_MAINT_APPEND=-O2
 endif