46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 874c746852c1922fbcc3c6bcb107cbfc30a14cc6 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Ernestas Kulik <ekulik@redhat.com>
|
|||
|
|
Date: Mon, 20 Jul 2020 06:37:55 +0200
|
|||
|
|
Subject: [PATCH] Fix Python module installation
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
Currently, all sources are installed as “pure”, which does not apply to
|
|||
|
|
the wrapper module. Moreover, Meson previously defaulted to “false” for
|
|||
|
|
the “pure” kwarg, which was subsequently fixed. Both of these issues
|
|||
|
|
make the RPM package unbuildable, which can be fixed by making all
|
|||
|
|
sources unpure (they all share the same module name, so it’s either this
|
|||
|
|
or renaming the wrapper module to avoid import conflicts).
|
|||
|
|
|
|||
|
|
https://github.com/mesonbuild/meson/commit/efb86088bcf89
|
|||
|
|
---
|
|||
|
|
src/gnome_abrt/meson.build | 1 +
|
|||
|
|
src/gnome_abrt/wrappers/meson.build | 1 +
|
|||
|
|
2 files changed, 2 insertions(+)
|
|||
|
|
|
|||
|
|
diff --git a/src/gnome_abrt/meson.build b/src/gnome_abrt/meson.build
|
|||
|
|
index 88489b5..f1844b9 100644
|
|||
|
|
--- a/src/gnome_abrt/meson.build
|
|||
|
|
+++ b/src/gnome_abrt/meson.build
|
|||
|
|
@@ -42,6 +42,7 @@ foreach file: gnome_abrt_sources
|
|||
|
|
endforeach
|
|||
|
|
|
|||
|
|
python_installation.install_sources(gnome_abrt_generated_sources + gnome_abrt_sources,
|
|||
|
|
+ pure: false,
|
|||
|
|
subdir: 'gnome_abrt',
|
|||
|
|
)
|
|||
|
|
|
|||
|
|
diff --git a/src/gnome_abrt/wrappers/meson.build b/src/gnome_abrt/wrappers/meson.build
|
|||
|
|
index 412b0e2..a185bf1 100644
|
|||
|
|
--- a/src/gnome_abrt/wrappers/meson.build
|
|||
|
|
+++ b/src/gnome_abrt/wrappers/meson.build
|
|||
|
|
@@ -11,6 +11,7 @@ foreach file: gnome_abrt_wrappers_sources
|
|||
|
|
endforeach
|
|||
|
|
|
|||
|
|
python_installation.install_sources(gnome_abrt_wrappers_sources,
|
|||
|
|
+ pure: false,
|
|||
|
|
subdir: 'gnome_abrt/wrappers',
|
|||
|
|
)
|
|||
|
|
|