diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-01-26 21:27:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-28 00:07:08 +0000 |
commit | d58a8a153cf21dcbe98b0cdc138efafb75459d28 (patch) | |
tree | 461ae45ad8a56f27c526769dae836ebfcd5c46ff /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb | |
parent | d6f97cf271080779675094d83f17e9974f9c0927 (diff) | |
download | poky-d58a8a153cf21dcbe98b0cdc138efafb75459d28.tar.gz |
gdk-pixbuf: do not use tools from gdk-pixbuf-native when building tests
The patch that allows to do so has not been accepted upstream, and wasn't correctly
working as it was running a native executable (gdk-pixbuf-query-loaders) with target .so plugins.
On the other hand, out of 20+ (currently 23) tests only three require
running binaries at build time to produce special test-specific input data:
cve-2015-4491
pixbuf-pixdata
pixbuf-resource
So let's simply omit these from the build: this can be done with a far
less invasive patch which has a chance of being accepted upstream.
gdk-pixbuf-print-mime-types is no longer installed
(the replaced patch was doing that).
(From OE-Core rev: 0d926508e75095eb446699b612729d0243eacc91)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb index aa44515fbb..cca89a9059 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb | |||
@@ -12,15 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
12 | 12 | ||
13 | SECTION = "libs" | 13 | SECTION = "libs" |
14 | 14 | ||
15 | DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" | 15 | DEPENDS = "glib-2.0 shared-mime-info" |
16 | DEPENDS:remove:class-native = "gdk-pixbuf-native" | ||
17 | 16 | ||
18 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 17 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
19 | 18 | ||
20 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 19 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ |
21 | file://run-ptest \ | 20 | file://run-ptest \ |
22 | file://fatal-loader.patch \ | 21 | file://fatal-loader.patch \ |
23 | file://0001-Add-use_prebuilt_tools-option.patch \ | 22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ |
24 | " | 23 | " |
25 | 24 | ||
26 | SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" | 25 | SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" |
@@ -46,14 +45,6 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" | |||
46 | 45 | ||
47 | EXTRA_OEMESON = "-Dman=false" | 46 | EXTRA_OEMESON = "-Dman=false" |
48 | 47 | ||
49 | EXTRA_OEMESON:append:class-target = " \ | ||
50 | -Duse_prebuilt_tools=true \ | ||
51 | " | ||
52 | |||
53 | EXTRA_OEMESON:append:class-nativesdk = " \ | ||
54 | -Duse_prebuilt_tools=true \ | ||
55 | " | ||
56 | |||
57 | PACKAGES =+ "${PN}-xlib" | 48 | PACKAGES =+ "${PN}-xlib" |
58 | 49 | ||
59 | # For GIO image type sniffing | 50 | # For GIO image type sniffing |
@@ -115,10 +106,6 @@ do_install:append:class-native() { | |||
115 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | 106 | XDG_DATA_DIRS=${STAGING_DATADIR} \ |
116 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | 107 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache |
117 | 108 | ||
118 | create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ | ||
119 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | ||
120 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | ||
121 | |||
122 | create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ | 109 | create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ |
123 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | 110 | XDG_DATA_DIRS=${STAGING_DATADIR} \ |
124 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ | 111 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ |