diff options
| -rw-r--r-- | meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/libmodulemd/libmodulemd_git.bb | 11 |
2 files changed, 6 insertions, 28 deletions
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch deleted file mode 100644 index a97fb73907..0000000000 --- a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-meson.build-do-not-install-python-gi-bindings.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | From d7eeac90fe02ccf5c5e4334e41ec75fc33803643 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 31 Mar 2020 16:12:28 +0200 | ||
| 4 | Subject: [PATCH] meson.build: do not install python gi bindings | ||
| 5 | |||
| 6 | These are unnecessary for oe-core, and the install location | ||
| 7 | is incorrectly determined using native python. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 11 | --- | ||
| 12 | meson.build | 1 - | ||
| 13 | 1 file changed, 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/meson.build b/meson.build | ||
| 16 | index a8b02b4..8ff737b 100644 | ||
| 17 | --- a/meson.build | ||
| 18 | +++ b/meson.build | ||
| 19 | @@ -171,4 +171,3 @@ configure_file( | ||
| 20 | ) | ||
| 21 | |||
| 22 | subdir('modulemd') | ||
| 23 | -subdir('bindings/python') | ||
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index d440e60ee6..fda01b8ad8 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb | |||
| @@ -4,17 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" | |||
| 4 | 4 | ||
| 5 | SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ | 5 | SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \ |
| 6 | file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ | 6 | file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ |
| 7 | file://0002-meson.build-do-not-install-python-gi-bindings.patch \ | ||
| 8 | " | 7 | " |
| 9 | 8 | ||
| 10 | PV = "2.9.2" | 9 | PV = "2.9.4" |
| 11 | SRCREV = "780750eab8a0587b20d033f335301f16d00ab9c9" | 10 | SRCREV = "c7254db07b21495fc9bd247c5b17ee20149c05e3" |
| 12 | 11 | ||
| 13 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 14 | 13 | ||
| 15 | inherit meson gobject-introspection | 14 | inherit meson gobject-introspection python3-dir |
| 16 | 15 | ||
| 17 | EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled" | 16 | EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" |
| 18 | 17 | ||
| 19 | DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" | 18 | DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" |
| 20 | 19 | ||
| @@ -23,3 +22,5 @@ BBCLASSEXTEND = "native nativesdk" | |||
| 23 | GIR_MESON_OPTION = 'skip_introspection' | 22 | GIR_MESON_OPTION = 'skip_introspection' |
| 24 | GIR_MESON_ENABLE_FLAG = 'false' | 23 | GIR_MESON_ENABLE_FLAG = 'false' |
| 25 | GIR_MESON_DISABLE_FLAG = 'true' | 24 | GIR_MESON_DISABLE_FLAG = 'true' |
| 25 | |||
| 26 | FILES_${PN} += "${libdir}/${PYTHON_DIR}/*" | ||
