summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-10-01 22:35:58 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-10-01 23:10:21 +0200
commit1ab146cbac35806517568a0c09b7606143a7b9ac (patch)
tree58a6fb941d83c9dfc899eb6ccfd3c340b2dd4110 /patches
parentc968ab2e1a5b456d92461f7a471d750602552cf3 (diff)
downloadptxdist-1ab146cbac35806517568a0c09b7606143a7b9ac.tar.gz
ptxdist-1ab146cbac35806517568a0c09b7606143a7b9ac.tar.xz
meson: add hack to fix NEON detection
Without this, pulseaudio fails to build on ARMv5. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch25
-rw-r--r--patches/meson-0.51.2/series3
2 files changed, 27 insertions, 1 deletions
diff --git a/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch
new file mode 100644
index 000000000..a479b4083
--- /dev/null
+++ b/patches/meson-0.51.2/0004-HACK-enable-NEON-only-for-ARMv7.patch
@@ -0,0 +1,25 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 1 Oct 2019 22:30:59 +0200
+Subject: [PATCH] HACK: enable NEON only for ARMv7
+
+NEON detection is broken, so just skip it for anything that is not ARMv7.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ mesonbuild/modules/unstable_simd.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
+index 2f2f67f79091..a329a4761d20 100644
+--- a/mesonbuild/modules/unstable_simd.py
++++ b/mesonbuild/modules/unstable_simd.py
+@@ -62,6 +62,9 @@ class SimdModule(ExtensionModule):
+ continue
+ iset_fname = kwargs[iset] # Migth also be an array or Files. static_library will validate.
+ args = compiler.get_instruction_set_args(iset)
++ cpu = state.environment.machines.host.cpu
++ if iset == 'neon' and not cpu.startswith('armv7'):
++ args = None
+ if args is None:
+ mlog.log('Compiler supports %s:' % iset, mlog.red('NO'))
+ continue
diff --git a/patches/meson-0.51.2/series b/patches/meson-0.51.2/series
index 119016a64..e6ca14c3f 100644
--- a/patches/meson-0.51.2/series
+++ b/patches/meson-0.51.2/series
@@ -3,4 +3,5 @@
0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
0003-HACK-don-t-loose-the-rpath-for-host-packages.patch
-# 5cb122e1f6a7d12f6e2fc7dd5a2d329b - git-ptx-patches magic
+0004-HACK-enable-NEON-only-for-ARMv7.patch
+# 3d7acfa5e27658c133f3d4f6976b1453 - git-ptx-patches magic