[neon/qt/qtwebengine/Neon/release] debian: Pass -z notext to linker to fix build on i386.

[Dmitry Shachnev]

Git commit bc6f6addf07ecea2e8987032cd0f196655887640 by Dmitry Shachnev.
Committed on 27/06/2022 at 08:36.
Pushed by jriddell into branch 'Neon/release'.

Pass -z notext to linker to fix build on i386.

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

https://invent.kde.org/neon/qt/qtwebengine/commit/bc6f6addf07ecea2e8987032cd0f196655887640

diff --git a/debian/changelog b/debian/changelog
index ebda6b3..122e748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebengine-opensource-src (5.15.10+dfsg-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Disable CONFIG_THUMB to fix build on armhf.
+  * Pass -z notext to linker to fix build on i386.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 26 Jun 2022 18:34:00 +0300
 
diff --git a/debian/rules b/debian/rules
index 20b081a..03aca5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,6 +113,14 @@ endif
 	# Missing hardening flag detected by blhc
 	echo "QMAKE_LFLAGS += -Wl,-z,now" >> .qmake.conf
 
+ifeq ($(DEB_HOST_ARCH),i386)
+	# Make the following linker warning on i386 not fatal:
+	# /usr/bin/ld: .../src/core/release/obj/third_party/ffmpeg/ffmpeg_nasm/dct32.o: warning: relocation in read-only section `.text'
+	# /usr/bin/ld: warning: creating DT_TEXTREL in a shared object
+	# Upstream does the same for lld linker, see third_party/ffmpeg/BUILD.gn.
+	echo "QMAKE_LFLAGS += -Wl,-z,notext" >> .qmake.conf
+endif
+
 	# Run qmake again now with the proper values.
 	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS+="$(config_args)" QMAKE_PYTHON2=python2