[neon/backports-focal/wayland/Neon/unstable] debian/patches: add patch to prevent meson trying to be too clever on i386 cross compile

Jonathan Esk-Riddell null at kde.org
Fri Mar 11 11:41:03 GMT 2022


Git commit d88300119a76fec4ebf56a9f4f4e809f668a06ee by Jonathan Esk-Riddell.
Committed on 11/03/2022 at 11:40.
Pushed by jriddell into branch 'Neon/unstable'.

add patch to prevent meson trying to be too clever on i386 cross compile

A  +19   -0    debian/patches/meson-no-cross-compile.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-focal/wayland/commit/d88300119a76fec4ebf56a9f4f4e809f668a06ee

diff --git a/debian/patches/meson-no-cross-compile.diff b/debian/patches/meson-no-cross-compile.diff
new file mode 100644
index 0000000..356db00
--- /dev/null
+++ b/debian/patches/meson-no-cross-compile.diff
@@ -0,0 +1,19 @@
+Index: wayland-1.20.0/src/meson.build
+===================================================================
+diff --git a/.pc/patchy/src/meson.build b/src/meson.build
+index ae8f387..3fcbf6b 100644
+--- a/.pc/patchy/src/meson.build
++++ b/src/meson.build
+@@ -69,12 +69,7 @@ if get_option('scanner')
+ 	)
+ endif
+ 
+-if meson.is_cross_build() or not get_option('scanner')
+-	scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version())
+-	wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
+-else
+ 	wayland_scanner_for_build = wayland_scanner
+-endif
+ 
+ if get_option('libraries')
+ 	# wayland libraries
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..304e623
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+meson-no-cross-compile.diff


More information about the Neon-commits mailing list