summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-18 13:41:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-19 16:14:57 +0000
commit46c48563774b7c8ff8ac7b981d47ddb2bb7a4624 (patch)
tree867b7d56bcd64c16eb456906c09b52973edcafed
parent3b988a1ed233e7059157a4ae38a48bfaf8b92d2e (diff)
downloadpoky-46c48563774b7c8ff8ac7b981d47ddb2bb7a4624.tar.gz
libsoup-2.4: convert from autotools to meson
(From OE-Core rev: df6dbc1ba37937c3338f6d842af99f1f1c1a626d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch24
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb27
2 files changed, 46 insertions, 5 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
new file mode 100644
index 0000000000..72b029a80b
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-Do-not-enforce-no-introspection-when-cross-building.patch
@@ -0,0 +1,24 @@
1From 921888affe66953c92a08ae440e911b016b124be Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 15 Feb 2019 14:21:06 +0100
4Subject: [PATCH] Do not enforce no-introspection when cross-building
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 meson.build | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/meson.build b/meson.build
13index 5a92cda..cfb3520 100644
14--- a/meson.build
15+++ b/meson.build
16@@ -262,7 +262,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows'
17 #########################
18 # GObject introspection #
19 #########################
20-enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build()
21+enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
22
23 ############
24 # Vala API #
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
index 9f852d5c05..ae7c1a6863 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb
@@ -9,20 +9,37 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl"
9 9
10SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" 10SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
11 11
12SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" 12SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
13 file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \
14 "
13SRC_URI[md5sum] = "cac755dc6c6acd6e0c70007f547548f5" 15SRC_URI[md5sum] = "cac755dc6c6acd6e0c70007f547548f5"
14SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6" 16SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6"
15 17
16S = "${WORKDIR}/libsoup-${PV}" 18S = "${WORKDIR}/libsoup-${PV}"
17 19
18inherit autotools gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc 20inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc
19 21
20# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default. 22# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Disable by default.
21PACKAGECONFIG ??= "" 23PACKAGECONFIG ??= ""
22PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" 24PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false"
23PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" 25PACKAGECONFIG[gssapi] = "-Dgssapi=true,-Dgssapi=false,krb5"
26
27EXTRA_OEMESON_append = " -Dvapi=false"
28
29GTKDOC_ENABLE_FLAG = "-Ddoc=true"
30GTKDOC_DISABLE_FLAG = "-Ddoc=false"
31
32GI_ENABLE_FLAG = "-Dintrospection=true"
33GI_DISABLE_FLAG = "-Dintrospection=false"
34
35EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
36
37EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
38 '${GI_DISABLE_FLAG}', d)} "
39
40EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
41 '${GTKDOC_DISABLE_FLAG}', d)} "
24 42
25EXTRA_OECONF = "--disable-vala"
26 43
27# When built without gnome support, libsoup-2.4 will contain only one shared lib 44# When built without gnome support, libsoup-2.4 will contain only one shared lib
28# and will therefore become subject to renaming by debian.bbclass. Prevent 45# and will therefore become subject to renaming by debian.bbclass. Prevent