[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] patches: Add backport/meson-Fix-cross-building-of-dtrace-probes.patch

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
56231e30 by Andrea Bolognani at 2021-01-26T23:05:35+01:00
patches: Add backport/meson-Fix-cross-building-of-dtrace-probes.patch

Closes: #980334

- - - - -


4 changed files:

- + debian/patches/backport/meson-Fix-cross-building-of-dtrace-probes.patch
- debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
- debian/patches/debian/Set-defaults-for-zfs-tools.patch
- debian/patches/series


Changes:

=====================================
debian/patches/backport/meson-Fix-cross-building-of-dtrace-probes.patch
=====================================
@@ -0,0 +1,80 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Date: Tue, 19 Jan 2021 00:08:23 +0100
+Subject: meson: Fix cross-building of dtrace probes
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+dtrace invokes the C compiler, so when cross-building we need
+to make sure that $CC is set in the environment and that it
+points to the cross-compiler rather than the native one.
+
+Until https://github.com/mesonbuild/meson/issues/266
+is addressed, the workaround is to call dtrace via env(1).
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980334
+
+Signed-off-by: Helmut Grohne <helmut at subdivi.de>
+Reviewed-by: Andrea Bolognani <abologna at redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>
+(cherry picked from commit 44b348134cd6724e35984a553f8d54d27aa22711)
+---
+ meson.build          | 1 +
+ src/meson.build      | 4 ++--
+ src/qemu/meson.build | 4 ++--
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index b5164f6..5607898 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2029,6 +2029,7 @@ if host_machine.system() == 'linux'
+   if dtrace_prog.found()
+     conf.set('WITH_DTRACE_PROBES', 1)
+   endif
++  dtrace_command = [ 'env', 'CC=' + ' '.join(meson.get_compiler('c').cmd_array()), dtrace_prog ]
+ endif
+ 
+ if not get_option('host_validate').disabled() and host_machine.system() != 'windows'
+diff --git a/src/meson.build b/src/meson.build
+index 7c47821..56e71f4 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -60,14 +60,14 @@ if conf.has('WITH_DTRACE_PROBES')
+     out_h,
+     input: infile,
+     output: out_h,
+-    command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
++    command: dtrace_command + [ '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
+   )
+ 
+   dtrace_gen_objects += custom_target(
+     out_o,
+     input: infile,
+     output: out_o,
+-    command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
++    command: dtrace_command + [ '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
+   )
+ 
+   custom_target(
+diff --git a/src/qemu/meson.build b/src/qemu/meson.build
+index 90640b0..e3065c3 100644
+--- a/src/qemu/meson.build
++++ b/src/qemu/meson.build
+@@ -56,14 +56,14 @@ if conf.has('WITH_DTRACE_PROBES')
+     out_h,
+     input: infile,
+     output: out_h,
+-    command: [ dtrace_prog, '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
++    command: dtrace_command + [ '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ],
+   )
+ 
+   qemu_dtrace_gen_objects += custom_target(
+     out_o,
+     input: infile,
+     output: out_o,
+-    command: [ dtrace_prog, '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
++    command: dtrace_command + [ '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ],
+   )
+ 
+   qemu_dtrace_gen_stp = custom_target(


=====================================
debian/patches/debian/Revert-m4-virt-xdr-rewrite-XDR-check.patch
=====================================
@@ -37,7 +37,7 @@ this revert and follow upstream as 2.32 dropped the option to enable
  1 file changed, 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 899404b..81d617b 100644
+index da0157b..9121ea5 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1429,8 +1429,6 @@ endif


=====================================
debian/patches/debian/Set-defaults-for-zfs-tools.patch
=====================================
@@ -8,7 +8,7 @@ so we don't have to build-depend on a program in contrib
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index b5164f6..899404b 100644
+index 5607898..da0157b 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1984,18 +1984,15 @@ if conf.has('WITH_LIBVIRTD')


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,5 @@
 backport/apparmor-let-image-label-setting-loop-over-backing-files.patch
+backport/meson-Fix-cross-building-of-dtrace-probes.patch
 forward/Skip-vircgrouptest.patch
 forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
 forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/56231e30d34fee813330a1b0429c301084a08428

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/commit/56231e30d34fee813330a1b0429c301084a08428
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210127/67046abc/attachment-0001.html>