Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-02-25 10:53:53 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2022-02-25 10:53:53 +0100
commit1aba00faee9771338a61e4572becce7333cd4581 (patch)
treef020ab49cd4e4393491cd44f527fdaa0d7d34543
parent1506b7c4219047031afd155ff18da833965e611b (diff)
extra/qt5-base: disabled all LTO stuff on i486
-rw-r--r--extra/qt5-base/PKGBUILD12
-rw-r--r--extra/qt5-base/qtbase-no-ltcg-broken.patch23
2 files changed, 35 insertions, 0 deletions
diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD
index 0f8c26cb..1a79f2de 100644
--- a/extra/qt5-base/PKGBUILD
+++ b/extra/qt5-base/PKGBUILD
@@ -28,3 +28,15 @@ if [ "$CARCH" = 'i486' ]; then
'
)"
fi
+# -no-ltcg is partially ignored, patching it directly in the mkspecs
+source+=('qtbase-no-ltcg-broken.patch')
+sha256sums+=('024549dbb8cc76921c16070b4cf1253e88fd33f78d6756e2ee398c405b8d1979')
+if [ "$CARCH" = 'i486' ]; then
+ eval "$(
+ declare -f prepare | \
+ sed '
+ $ i \
+ patch -p1 < ../qtbase-no-ltcg-broken.patch
+ '
+ )"
+fi
diff --git a/extra/qt5-base/qtbase-no-ltcg-broken.patch b/extra/qt5-base/qtbase-no-ltcg-broken.patch
new file mode 100644
index 00000000..231b0103
--- /dev/null
+++ b/extra/qt5-base/qtbase-no-ltcg-broken.patch
@@ -0,0 +1,23 @@
+diff -rauN qtbase-5.15.2/mkspecs/common/gcc-base.conf qtbase-5.15.2--no-ltcg-broken-patch/mkspecs/common/gcc-base.conf
+--- qtbase-5.15.2/mkspecs/common/gcc-base.conf 2022-02-25 09:58:02.608162266 +0100
++++ qtbase-5.15.2--no-ltcg-broken-patch/mkspecs/common/gcc-base.conf 2022-02-25 10:06:31.605250485 +0100
+@@ -54,8 +54,8 @@
+ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+ QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
+ QMAKE_CFLAGS_SPLIT_SECTIONS += -ffunction-sections -fdata-sections
+-QMAKE_CFLAGS_LTCG = -flto -fno-fat-lto-objects
+-QMAKE_CFLAGS_LTCG_FATOBJECTS = -ffat-lto-objects
++QMAKE_CFLAGS_LTCG =
++QMAKE_CFLAGS_LTCG_FATOBJECTS =
+ QMAKE_CFLAGS_DISABLE_LTCG = -fno-lto
+ QMAKE_CFLAGS_SHSTK = -mshstk
+
+@@ -88,7 +88,7 @@
+ QMAKE_LFLAGS_RELEASE +=
+ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO +=
+ QMAKE_LFLAGS_EXCEPTIONS_OFF +=
+-QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG -fuse-linker-plugin
++QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
+
+ QMAKE_CFLAGS_C99 = -std=c99
+ QMAKE_CFLAGS_C11 = -std=c11