Control: tags -1 + patch
please find a possible fix attached. However when I enable the patch in
debian/patches/series, I get:
$ dpkg-buildpackage -sd -S -d
dpkg-buildpackage: info: source package meson
dpkg-buildpackage: info: source version 0.56.0-1.1
dpkg-buildpackage: info: source distribution unstable
dpkg-buildpackage: info: source changed by Matthias Klose <d...@debian.org>
dpkg-source --before-build .
dpkg-source: info: using patch list from debian/patches/series
dpkg-source: info: applying 1-disable-openmpi.patch
dpkg-source: info: applying 2-disable-rootdir-test.patch
dpkg-source: info: applying skip-unimplemented-aarch64-test.diff
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/test cases/common/122 llvm ir and assembly/meson.build b/test
cases/common/122 llvm ir and assembly/meson.build
|--- a/test cases/common/122 llvm ir and assembly/meson.build
|+++ b/test cases/common/122 llvm ir and assembly/meson.build
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'skip-unimplemented-aarch64-test.diff' is correctly
applied by quilt, use 'quilt refresh' to update it
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B
.pc/skip-unimplemented-aarch64-test.diff/ --reject-file=- <
meson-0.56.0/debian/patches/skip-unimplemented-aarch64-test.diff subprocess
returned exit status 1
dpkg-buildpackage: error: dpkg-source --before-build . subprocess returned exit
status 2
Note that applying the first two patches (already in the package) works fine.
diff -Nru meson-0.56.0/debian/changelog meson-0.56.0/debian/changelog
--- meson-0.56.0/debian/changelog 2020-10-30 09:28:21.000000000 +0100
+++ meson-0.56.0/debian/changelog 2020-11-28 15:30:07.000000000 +0100
@@ -1,3 +1,10 @@
+meson (0.56.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Skip unimplmented test on arm64.
+
+ -- Matthias Klose <d...@debian.org> Sat, 28 Nov 2020 15:30:07 +0100
+
meson (0.56.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru meson-0.56.0/debian/patches/series meson-0.56.0/debian/patches/series
--- meson-0.56.0/debian/patches/series 2020-10-30 09:28:05.000000000 +0100
+++ meson-0.56.0/debian/patches/series 2020-11-28 15:30:07.000000000 +0100
@@ -1,2 +1,3 @@
1-disable-openmpi.patch
2-disable-rootdir-test.patch
+#skip-unimplemented-aarch64-test.diff
diff -Nru meson-0.56.0/debian/patches/skip-unimplemented-aarch64-test.diff
meson-0.56.0/debian/patches/skip-unimplemented-aarch64-test.diff
--- meson-0.56.0/debian/patches/skip-unimplemented-aarch64-test.diff
1970-01-01 01:00:00.000000000 +0100
+++ meson-0.56.0/debian/patches/skip-unimplemented-aarch64-test.diff
2020-11-28 15:30:07.000000000 +0100
@@ -0,0 +1,12 @@
+diff --git a/test cases/common/122 llvm ir and assembly/meson.build b/test
cases/common/122 llvm ir and assembly/meson.build
+--- a/test cases/common/122 llvm ir and assembly/meson.build
++++ b/test cases/common/122 llvm ir and assembly/meson.build
+@@ -1,7 +1,7 @@
+ project('llvm-ir', 'c', 'cpp')
+
+ cpu = host_machine.cpu_family()
+-supported_cpus = ['arm', 'aarch64', 'x86', 'x86_64']
++supported_cpus = ['arm', 'x86', 'x86_64']
+
+ foreach lang : ['c', 'cpp']
+ cc = meson.get_compiler(lang)
