Skip to contentSkip to conversation

pango: convert from autotools to meson

PATCH In review Alexander Kanavin 4 participants 17 messages Feb 20, 2019 – Mar 1, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 pango: convert from autotools to meson

Drop the autotools-specific patch.

---
 ...on-of-docs-pango.types-it-is-build-c.patch | 147 ------------------
 meta/recipes-graphics/pango/pango_1.42.4.bb   |  33 ++--
 2 files changed, 24 insertions(+), 156 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted +0 -147
deleted file mode 100644
index 6784a105a55..00000000000
@@ -1,147 +0,0 @@
-From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 2 Sep 2016 14:00:24 +0300
-Subject: [PATCH] Enforce recreation of docs/pango.types; it is build
- configuration-specific.
-
-In particular, it needs to exclude references to PangoXft if Xft is not available.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- docs/Makefile.am | 17 ++++--------
- docs/pango.types | 80 --------------------------------------------------------
- 2 files changed, 5 insertions(+), 92 deletions(-)
- delete mode 100644 docs/pango.types
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index f5f1317..8947a99 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -49,6 +49,10 @@ IGNORE_HFILES=			\
- 	pangocoretext-private.h		\
- 	pangoatsui-private.h
- 
-+if !HAVE_XFT
-+IGNORE_HFILES += pangoxft pangoxft-render.h
-+endif
-+
- # CFLAGS and LDFLAGS for compiling scan program. Only needed
- # if $(DOC_MODULE).types is non-empty.
- INCLUDES =               	\
-@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make
- # This line really belongs in gtk-doc.mk
- $(REPORT_FILES): sgml-build.stamp
- 
--pango.types:
--	@echo "Rebuilding $@"
--	@LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \
--	echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > [email protected] && \
--	echo >> [email protected] && \
--	echo "$$LIST" | cut -d : -f 2 | sort -u >> [email protected] && \
--	mv [email protected] $@
--
--BUILT_SOURCES = pango.types
--
- ########################################################################
- 
- MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-@@ -120,8 +114,7 @@ EXTRA_DIST +=				\
- 	layout.fig			\
- 	layout.eps			\
- 	version.xml.in			\
--	check.docs			\
--	pango.types
-+	check.docs
- 
- # force doc rebulid after configure
- dist-hook-local: dist-local-check-no-cross-references all-local
-diff --git a/docs/pango.types b/docs/pango.types
-deleted file mode 100644
-index 7d93cda..0000000
---- a/docs/pango.types
-+++ /dev/null
-@@ -1,80 +0,0 @@
--#include <pango/pango-attributes.h>
--#include <pango/pango-context.h>
--#include <pango/pango-engine.h>
--#include <pango/pango-enum-types.h>
--#include <pango/pango-font.h>
--#include <pango/pango-fontmap.h>
--#include <pango/pango-fontset.h>
--#include <pango/pango-glyph-item.h>
--#include <pango/pango-glyph.h>
--#include <pango/pango-item.h>
--#include <pango/pango-language.h>
--#include <pango/pango-layout.h>
--#include <pango/pango-matrix.h>
--#include <pango/pango-ot.h>
--#include <pango/pango-renderer.h>
--#include <pango/pango-tabs.h>
--#include <pango/pangocairo-fc.h>
--#include <pango/pangocairo.h>
--#include <pango/pangofc-decoder.h>
--#include <pango/pangofc-font.h>
--#include <pango/pangofc-fontmap.h>
--#include <pango/pangoft2.h>
--#include <pango/pangoxft-render.h>
--#include <pango/pangoxft.h>
--
--pango_alignment_get_type
--pango_attr_list_get_type
--pango_attr_type_get_type
--pango_bidi_type_get_type
--pango_cairo_fc_font_map_get_type
--pango_cairo_font_get_type
--pango_cairo_font_map_get_type
--pango_color_get_type
--pango_context_get_type
--pango_coverage_level_get_type
--pango_direction_get_type
--pango_ellipsize_mode_get_type
--pango_engine_get_type
--pango_engine_lang_get_type
--pango_engine_shape_get_type
--pango_fc_decoder_get_type
--pango_fc_font_get_type
--pango_fc_font_map_get_type
--pango_font_description_get_type
--pango_font_face_get_type
--pango_font_family_get_type
--pango_font_get_type
--pango_font_map_get_type
--pango_font_mask_get_type
--pango_font_metrics_get_type
--pango_fontset_get_type
--pango_fontset_simple_get_type
--pango_ft2_font_map_get_type
--pango_glyph_item_get_type
--pango_glyph_item_iter_get_type
--pango_glyph_string_get_type
--pango_gravity_get_type
--pango_gravity_hint_get_type
--pango_item_get_type
--pango_language_get_type
--pango_layout_get_type
--pango_layout_iter_get_type
--pango_layout_line_get_type
--pango_matrix_get_type
--pango_ot_info_get_type
--pango_ot_ruleset_get_type
--pango_render_part_get_type
--pango_renderer_get_type
--pango_script_get_type
--pango_stretch_get_type
--pango_style_get_type
--pango_tab_align_get_type
--pango_tab_array_get_type
--pango_underline_get_type
--pango_variant_get_type
--pango_weight_get_type
--pango_wrap_mode_get_type
--pango_xft_font_get_type
--pango_xft_font_map_get_type
--pango_xft_renderer_get_type
--- 
-2.9.3
-
meta/recipes-graphics/pango/pango_1.42.4.bb +24 -9
index a09f7a8e701..e181bcb5005 100644
@@ -11,10 +11,11 @@ LICENSE = "LGPLv2.0+"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
+GNOMEBASEBUILDCLASS = "meson"
+
 inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
 
 SRC_URI += "file://run-ptest \
-            file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \
 "
 SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c"
 SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d"
@@ -22,18 +23,25 @@ SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa76
 DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
+PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
+
+GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
+GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
+
+GI_ENABLE_FLAG = "-Dgir=true"
+GI_DISABLE_FLAG = "-Dgir=false"
+
+EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
+
+EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
+                                                                                       '${GI_DISABLE_FLAG}', d)} "
+
+EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
+                                                                                     '${GTKDOC_DISABLE_FLAG}', d)} "
 
 LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.8.0"
 
-# This binary needs to be compiled for the host architecture.  This isn't pretty!
-do_compile_prepend_class-target () {
-	if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
-		make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="${BUILD_LDFLAGS}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode
-	fi
-}
-
 FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
 FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
 
@@ -43,3 +51,10 @@ RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
                     pango-module-basic-fc pango-module-arabic-lang"
 
 BBCLASSEXTEND = "native nativesdk"
+
+do_install_append () {
+	if [ "${PTEST_ENABLED}" != "1" ]; then
+		rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests
+                rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir}
+	fi
+}
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/4 llvm: switch to the official git repository

Until now an unoffcial mirror was used, which may or may not be maintained in the longer run, as the need for it has gone.

Also, the official mirror has version tags which allows us to track upstream development in an automated manner.

${S} has changed as upstream decided to use a monorepo for all of the llvm-related projects.

Further info:
https://www.phoronix.com/scan.php?page=news_item&px=LLVM-GitHub-Mono-Repo
https://llvm.org/docs/GettingStarted.html#checkout-llvm-from-git

---
 meta/recipes-devtools/llvm/llvm_git.bb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
meta/recipes-devtools/llvm/llvm_git.bb +9 -5
index eca78af09e4..c68512cc63f 100644
@@ -19,20 +19,24 @@ PROVIDES += "llvm${PV}"
 LLVM_RELEASE = "${PV}"
 LLVM_DIR = "llvm${LLVM_RELEASE}"
 
-SRCREV = "e5cc6808dc0d5b773479bf36c51d59d0d3174733"
-BRANCH = "release_${MAJOR_VERSION}${MINOR_VERSION}"
+# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release
+# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN
+# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged
+UPSTREAM_VERSION_UNKNOWN = "1"
+SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f"
+
+BRANCH = "release/${MAJOR_VERSION}.x"
 MAJOR_VERSION = "8"
 MINOR_VERSION = "0"
 PATCH_VERSION = "0"
 SOLIBVER = "1"
 PV = "${MAJOR_VERSION}.${MINOR_VERSION}"
-SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH} \
+SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
            file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
            file://0002-llvm-allow-env-override-of-exe-path.patch \
           "
-UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/llvm"
 
 LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/4 gdk-pixbuf: convert from autotools to meson

In reply to Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

---
 .../0001-Disable-tests-in-native-builds.patch |  31 +++++
 ...f-decisions-around-cross-compilation.patch |  38 +++++
 ...without-libtiff-not-having-an-effect.patch |  27 ----
 ...nd-thumbnailer-cross-compile-failure.patch |  53 +++----
 ...-depend-on-loaders-being-fully-build.patch |  51 +++++++
 ...nd-thumbnailer-cross-compile-failure.patch | 131 ++++++++++++++++++
 .../extending-libinstall-dependencies.patch   |  42 ------
 .../gdk-pixbuf/hardcoded_libtool.patch        |  33 -----
 .../gdk-pixbuf/gdk-pixbuf_2.36.11.bb          |  47 +++++--
 9 files changed, 306 insertions(+), 147 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
 delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch new file +31 -0
new file mode 100644
index 00000000000..1e45b716b93
@@ -0,0 +1,31 @@
+From b287cb313dbfac3257f1ab451b19ba59580f78e1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 18 Feb 2019 16:00:12 +0100
+Subject: [PATCH] Disable tests in native builds.
+
+They have found to be problematic at least on Centos 7:
+https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b
+
+With autotools this was not a problem because it had a configuration
+switch for disabling test, which was used. Meson has no such facility :(
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 92c4049..0871c84 100644
+--- a/meson.build
++++ b/meson.build
+@@ -397,7 +397,7 @@ endif
+ # i18n
+ subdir('po')
+ 
+-subdir('tests')
++#subdir('tests')
+ subdir('thumbnailer')
+ 
+ # Documentation
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch new file +38 -0
new file mode 100644
index 00000000000..90d4830df50
@@ -0,0 +1,38 @@
+From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 14 Feb 2019 18:06:25 +0100
+Subject: [PATCH] Fix a couple of decisions around cross-compilation
+
+1. gobject-introspection can be build when cross compiling
+2. generating loaders.cache requires running a target binary which
+we do elsewhere (in postinsts)
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ gdk-pixbuf/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 77c162b..fc3eb33 100644
+--- a/gdk-pixbuf/meson.build
++++ b/gdk-pixbuf/meson.build
+@@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin
+   set_variable(bin_name.underscorify(), bin)
+ endforeach
+ 
++if not meson.is_cross_build()
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+@@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache',
+                               ],
+                               build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
++endif
+ 
+-build_gir = get_option('with_gir') and not meson.is_cross_build()
++build_gir = get_option('with_gir')
+ if build_gir
+   gir_args = [
+     '--quiet',
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch deleted +0 -27
deleted file mode 100644
index 2a54d8ed763..00000000000
@@ -1,27 +0,0 @@
-From 460befc992adb32434b0408b453be39a6866ccf8 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 10 Oct 2017 14:33:18 +0300
-Subject: [PATCH] Fix --without-libtiff not having an effect.
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=788770]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 315e0cc..98e780c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then
-   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
- fi
- 
--AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
-+AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
- AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
- AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
- AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
--- 
-2.14.1
-
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch +17 -36

64 lines not on this page · raw message

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch new file +51 -0

51 lines not on this page · raw message

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch new file +131 -0

131 lines not on this page · raw message

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch deleted +0 -33
deleted file mode 100644
index ecca62a7129..00000000000
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gdk-pixbuf-2.22.1/configure.ac
-===================================================================
---- gdk-pixbuf-2.22.1.orig/configure.ac	2010-11-26 09:06:34.000000000 +0800
-+++ gdk-pixbuf-2.22.1/configure.ac	2010-11-26 09:07:33.000000000 +0800
-@@ -287,7 +287,7 @@
- case $enable_explicit_deps in
-   auto)
-     export SED
--    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-+    deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes
-     else
-@@ -484,7 +484,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -957,7 +957,7 @@
- # We are using gmodule-no-export now, but I'm leaving the stripping
- # code in place for now, since pango and atk still require gmodule.
- export SED
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
- fi
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +38 -9

74 lines not on this page · raw message

Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" · line 66

Quoted 2 lines · Alexander Kanavin
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +1 -1
-PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
+PACKAGECONFIG[x11] = ",,virtual/libx11"

https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/204082e6a7a404ec7372d78ef7a7890ada595154
is in 2.36.12.

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb do_install_append() { · line 112

Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +4 -0
+       # Do not install ptests if ptest is not enabled; gdk-pixbuf has no configuration option for this
+       if [ "${PTEST_ENABLED}" != "1" ]; then
+               rm -rf ${D}${datadir}/installed-tests
+       fi

https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/4c76635e1f19c6d1919d4ea94f6b00f97b996665
is in 2.38.0.

Last minute upgrade or cherry-pick those?

Ross

#4 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 13 lines · Ross

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" · line 66

Quoted 2 lines · Alexander Kanavin
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +1 -1
-PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
+PACKAGECONFIG[x11] = ",,virtual/libx11"

https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/204082e6a7a404ec7372d78ef7a7890ada595154
is in 2.36.12.

meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb do_install_append() { · line 112

Quoted 4 lines
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +4 -0
+       # Do not install ptests if ptest is not enabled; gdk-pixbuf has no configuration option for this
+       if [ "${PTEST_ENABLED}" != "1" ]; then
+               rm -rf ${D}${datadir}/installed-tests
+       fi
Quoted 4 lines

https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/4c76635e1f19c6d1919d4ea94f6b00f97b996665
is in 2.38.0.

Last minute upgrade or cherry-pick those?

I've done the upgrade, will send it as a separate patch. It wasn't trivial:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=akanavin/package-version-updates&id=447725a8d54dc21643c04d798a47fc45d54b5afb

Alex

#5 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

In reply to Alexander Kanavin
Quoted 5 lines · Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

We've seen it before but its happened again:

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

I went into the failed build directory and ran "bitbake core-image-sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one...

Cheers,

Richard

#6 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 6 lines · Richard Purdie
Quoted 5 lines

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

Quoted 7 lines

We've seen it before but its happened again:

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

I went into the failed build directory and ran "bitbake core-image-sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one...

:-(
We can debug by making a tarball snapshot of the failed build dir, and statically inspecting it, I guess. It has to be some kind of race during SDK extraction.

Alex

#7 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

In reply to Richard Purdie
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

Quoted 7 lines

We've seen it before but its happened again:

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

I went into the failed build directory and ran "bitbake core-image- sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one...

From staring at the log, I think do_build_target_sysroot in build- sysroots.bb may need to depend on do_build_native_sysroot.

They're both running at the same time and potentially racing?

Cheers,

Richard

#8 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 13 lines · Richard Purdie
Quoted 11 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

We've seen it before but its happened again:

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

Quoted 8 lines
Quoted 3 lines

I went into the failed build directory and ran "bitbake core-image- sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one...

From staring at the log, I think do_build_target_sysroot in build- sysroots.bb may need to depend on do_build_native_sysroot.

They're both running at the same time and potentially racing?

I'm at the same time staring at this bit in pixbufcache.bbclass:

gdkpixbuf_complete() {
GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1
}

DEPENDS_append_class-native = " gdk-pixbuf-native" SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst"

# See base.bbclass for the other half of this

pixbufcache_sstate_postinst() {
        mkdir -p ${SYSROOT_DESTDIR}${bindir}
        dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
        echo '#!/bin/sh' > $dest
        echo "${gdkpixbuf_complete}" >> $dest
        chmod 0755 $dest
}

It's all written for -native, yet the script that fails, resides in tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g. the target sysroot which is racing with the native one). Why is it even there?
I haven't written this code :) and haven't really seen it before, but this might be a lead.

Alex

#9 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 46 lines · Alexander Kanavin
Quoted 18 lines · Richard Purdie
Quoted 9 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

We've seen it before but its happened again:

Quoted 7 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

I went into the failed build directory and ran "bitbake core- image-
sato -c testsdkext" and it succeeded so I'm not sure sure how we're
going to debug this one...

Quoted 4 lines

From staring at the log, I think do_build_target_sysroot in build- sysroots.bb may need to depend on do_build_native_sysroot.

They're both running at the same time and potentially racing?

I'm at the same time staring at this bit in pixbufcache.bbclass:

gdkpixbuf_complete() {
GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1
}

DEPENDS_append_class-native = " gdk-pixbuf-native" SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst"

# See base.bbclass for the other half of this

pixbufcache_sstate_postinst() {
        mkdir -p ${SYSROOT_DESTDIR}${bindir}
        dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
        echo '#!/bin/sh' > $dest
        echo "${gdkpixbuf_complete}" >> $dest
        chmod 0755 $dest
}
Quoted 6 lines

It's all written for -native, yet the script that fails, resides in tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g. the target sysroot which is racing with the native one). Why is it even there?
I haven't written this code :) and haven't really seen it before, but this might be a lead.

I'm sure I've worked on the above before, my memory of why we need it is fuzzy. I do now have a reproducer though:

bitbake gdk-pixbuf gdk-pixbuf-native
then
bitbake build-sysroots -c build_target_sysroot

If you bake build_native_sysroot first, the problem goes away.

Cheers,

Richard

#10 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 31 lines · Richard Purdie
Quoted 21 lines · Alexander Kanavin

I'm at the same time staring at this bit in pixbufcache.bbclass:

gdkpixbuf_complete() {
GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1
}

DEPENDS_append_class-native = " gdk-pixbuf-native" SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst"

# See base.bbclass for the other half of this

pixbufcache_sstate_postinst() {
        mkdir -p ${SYSROOT_DESTDIR}${bindir}
        dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
        echo '#!/bin/sh' > $dest
        echo "${gdkpixbuf_complete}" >> $dest
        chmod 0755 $dest
}
Quoted 8 lines

It's all written for -native, yet the script that fails, resides in tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g. the
target sysroot which is racing with the native one). Why is it even there?
I haven't written this code :) and haven't really seen it before, but
this might be a lead.

Quoted 8 lines

I'm sure I've worked on the above before, my memory of why we need it is fuzzy. I do now have a reproducer though:

bitbake gdk-pixbuf gdk-pixbuf-native
then
bitbake build-sysroots -c build_target_sysroot

If you bake build_native_sysroot first, the problem goes away.

I think the problem is in staging_populate_sysroot_dir(). It's confusing target and native package_archs since in the case we see this its x86_64 where the target and build archs match.

Not entirely sure how we'll fix this but that is where I think the problem is.

Not sure why we're suddenly seeing it now and whether the patches somehow trigger it or not...

Cheers,

Richard

#11 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 43 lines · Richard Purdie
Quoted 30 lines
Quoted 21 lines

I'm at the same time staring at this bit in pixbufcache.bbclass:

gdkpixbuf_complete() {
GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1
}

DEPENDS_append_class-native = " gdk-pixbuf-native" SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst"

# See base.bbclass for the other half of this

pixbufcache_sstate_postinst() {
        mkdir -p ${SYSROOT_DESTDIR}${bindir}
        dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
        echo '#!/bin/sh' > $dest
        echo "${gdkpixbuf_complete}" >> $dest
        chmod 0755 $dest
}
Quoted 8 lines

It's all written for -native, yet the script that fails, resides in tmp/sysroots/qemux86-64/usr/bin/postinst-gdk-pixbuf-native (e.g. the
target sysroot which is racing with the native one). Why is it even there?
I haven't written this code :) and haven't really seen it before, but
this might be a lead.

Quoted 8 lines

I'm sure I've worked on the above before, my memory of why we need it is fuzzy. I do now have a reproducer though:

bitbake gdk-pixbuf gdk-pixbuf-native
then
bitbake build-sysroots -c build_target_sysroot

If you bake build_native_sysroot first, the problem goes away.

I think the problem is in staging_populate_sysroot_dir(). It's confusing target and native package_archs since in the case we see this its x86_64 where the target and build archs match.

Quoted 5 lines

Not entirely sure how we'll fix this but that is where I think the problem is.

Not sure why we're suddenly seeing it now and whether the patches somehow trigger it or not...

The reproducer does fail on master too, so the patches may only have shifted the timings such that the race outcome is sometimes the failing one.

Alex

#12 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 9 lines · Alexander Kanavin

On Sat, 23 Feb 2019 at 14:36, Richard Purdie

Quoted 8 lines

I think the problem is in staging_populate_sysroot_dir(). It's confusing target and native package_archs since in the case we see this
its x86_64 where the target and build archs match.

Not entirely sure how we'll fix this but that is where I think the problem is.

Quoted 6 lines
Quoted 2 lines

Not sure why we're suddenly seeing it now and whether the patches somehow trigger it or not...

The reproducer does fail on master too, so the patches may only have shifted the timings such that the race outcome is sometimes the failing one.

Agreed, I think we've just exposed a bug. I've sent a patch to fix the problem in the function since its clearly not doing what was intended.

Cheers,

Richard

#13 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

In reply to Richard Purdie
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

Quoted 7 lines

We've seen it before but its happened again:

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

I went into the failed build directory and ran "bitbake core-image-sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one...

I am not sure if it is related, but we see psplash failing with a custom png recently.

failed to load ".../splashscreen-blue.png": Couldn’t recognize the image file format for file “.../splashscreen-blue.png”

The psplash calls gdk-pixbuf-csource (through make-image-header.sh). We only saw it failing when building in a Ubuntu 18.04 container, but then reproducible.

I also noticed this (probably unrelated) in do_configure log:

DEBUG: Executing shell function do_configure
gtkdocize: neither configure.ac nor configure.in exist
NOTE: Executing meson -Denable_jpeg=true -Denable_jasper=false -Denable_png=true -Denable_tiff=false -Dx11=false -Dinstalled_tests=false...
The Meson build system
Version: 0.49.2
Source dir:
/workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/gdk-pixbuf-2.38.0 Build dir:
/workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/build Build type: native build
WARNING: Unknown options: "enable_jasper, enable_jpeg, enable_png, enable_tiff
...

--
Stefan

#14 lore raw

Re: [PATCH 3/4] gdk-pixbuf: convert from autotools to meson

Quoted 35 lines · Stefan Agner
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

Drop autotools-specific patches.

Rework jku's thumbnailer patch into meson configuration.

Quoted 7 lines

We've seen it before but its happened again:

https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/326

I went into the failed build directory and ran "bitbake core-image-sato -c testsdkext" and it succeeded so I'm not sure sure how we're going to debug this one...

I am not sure if it is related, but we see psplash failing with a custom png recently.

failed to load ".../splashscreen-blue.png": Couldn’t recognize the image file format for file “.../splashscreen-blue.png”

The psplash calls gdk-pixbuf-csource (through make-image-header.sh). We only saw it failing when building in a Ubuntu 18.04 container, but then reproducible.

I also noticed this (probably unrelated) in do_configure log:

DEBUG: Executing shell function do_configure
gtkdocize: neither configure.ac nor configure.in exist
NOTE: Executing meson -Denable_jpeg=true -Denable_jasper=false

(quoted diff) +0 -2
-Denable_png=true -Denable_tiff=false -Dx11=false
-Dinstalled_tests=false...

The Meson build system
Version: 0.49.2

Quoted 8 lines

Source dir:
/workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/gdk-pixbuf-2.38.0 Build dir:
/workdir/oe/tmp/work/x86_64-linux/gdk-pixbuf-native/2.38.0-r0/build Build type: native build
WARNING: Unknown options: "enable_jasper, enable_jpeg, enable_png, enable_tiff
...

FWIW, I sent a patch to fix this particular warning just above. However, my issue persists.

The problem is definitly gdk-pixbuf related, but reverting the two patches from this patchset did not resolve the issue.

--
Stefan

#15 lore raw

PATCH 4/4 glib-2.0: convert from autotools to meson

In reply to Alexander Kanavin

PRINTF settings no longer seem necessary (tested with mingw).

Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and 0001-Install-gio-querymodules-as-libexec_PROGRAM.patch

Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch to allow 'mingw32' as target machine in addition to 'windows'.

Add 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch to correct ARM build errors.

Drop configure-libtool.patch (autotools-specific).

---
 ...t-write-bindir-into-pkg-config-files.patch |  50 +++++++++
 ...-gio-querymodules-as-libexec_PROGRAM.patch |  17 ++-
 ...-correctly-when-building-with-mingw3.patch | 104 ++++++++++++++++++
 ...ot-hardcode-linux-as-the-host-system.patch |  27 +++++
 ...dcode-python-path-into-various-tools.patch |   2 +-
 ...ble-more-tests-while-cross-compiling.patch |  91 ++++++++++++++-
 .../glib-2.0/glib-2.0/configure-libtool.patch |  44 --------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |   2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb |   4 +-
 meta/recipes-core/glib-2.0/glib.inc           |  35 +++---
 10 files changed, 310 insertions(+), 66 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch new file +50 -0
new file mode 100644
index 00000000000..ede29c90bab
@@ -0,0 +1,50 @@
+From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Fri, 15 Feb 2019 11:17:27 +0100
+Subject: [PATCH] Do not write $bindir into pkg-config files
+
+This would otherwise break when using the files to build other target
+components (we need to rely on PATH containing the paths to utilities,
+rather than use target paths).
+
+Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ gio/meson.build  | 6 +++---
+ glib/meson.build | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gio/meson.build b/gio/meson.build
+index 85d8b14..657720a 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+                'schemasdir=' + join_paths('${datadir}', schemas_subdir),
+                'bindir=' + join_paths('${prefix}', get_option('bindir')),
+                'giomoduledir=' + giomodulesdir,
+-               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
+-               'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
+-               'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
++               'glib_compile_schemas=glib-compile-schemas',
++               'glib_compile_resources=glib-compile-resources',
++               'gdbus_codegen=gdbus-codegen'],
+   version : glib_version,
+   install_dir : glib_pkgconfigreldir,
+   filebase : 'gio-2.0',
+diff --git a/glib/meson.build b/glib/meson.build
+index c05c694..434e8b1 100644
+--- a/glib/meson.build
++++ b/glib/meson.build
+@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+   subdirs : ['glib-2.0'],
+   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
+   variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
+-               'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
+-               'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
+-               'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
++               'glib_genmarshal=glib-genmarshal',
++               'gobject_query=gobject-query',
++               'glib_mkenums=glib-mkenums'],
+   version : glib_version,
+   install_dir : glib_pkgconfigreldir,
+   filebase : 'glib-2.0',
meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +15 -2
index 97d0aff5d6c..f246254942e 100644
@@ -1,4 +1,4 @@
-From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001
+From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <[email protected]>
 Date: Tue, 22 Mar 2016 15:14:58 +0200
 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -11,7 +11,8 @@ Upstream-Status: Inappropriate [OE specific]
 
 ---
  gio/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ gio/meson.build | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/gio/Makefile.am b/gio/Makefile.am
 index e14cad2..bf2bcc7 100644
@@ -27,3 +28,15 @@ index e14cad2..bf2bcc7 100644
  
  glib_compile_resources_LDADD = libgio-2.0.la 		\
  	$(top_builddir)/gobject/libgobject-2.0.la	\
+diff --git a/gio/meson.build b/gio/meson.build
+index b83d8f5..85d8b14 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+   c_args : gio_c_args,
+   # intl.lib is not compatible with SAFESEH
+   link_args : noseh_link_args,
++  install_dir: glib_libexecdir,
+   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
+ 
+ glib_compile_schemas = executable('glib-compile-schemas',
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch new file +104 -0

104 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch new file +27 -0
new file mode 100644
index 00000000000..5a1a5898908
@@ -0,0 +1,27 @@
+From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 19 Feb 2019 10:31:11 +0100
+Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
+
+OE build system can set this to other values that include 'linux',
+e.g. 'linux-gnueabi'
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 4348f20..af5ed63 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1574,7 +1574,7 @@ atomicdefine = '''
+ # We know that we can always use real ("lock free") atomic operations with MSVC
+ if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
+   have_atomic_lock_free = true
+-  if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
++  if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
+     # When building for armv5 on Linux, gcc provides
+     # __sync_bool_compare_and_swap but doesn't define
+     # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +1 -1
index 697d63d5feb..872340df964 100644
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 8050981..e693ef3 100644
+index 8050981..e693ef3 100755
 --- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
 +++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
 @@ -1,4 +1,4 @@
meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +88 -3

103 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1 -1
index 9ec011a0950..a4e0c9201f2 100644
@@ -1,4 +1,4 @@
-From 43967e85b7a87f9c2e780504ef30f4c9bf56f8f5 Mon Sep 17 00:00:00 2001
+From 9d985803c50cfb99253c757934985f937da34822 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb +3 -1
index 8aad570fa9d..2de2affa51a 100644
@@ -5,7 +5,6 @@ PE = "1"
 SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
-           file://configure-libtool.patch \
            file://run-ptest \
            file://uclibc_musl_translation.patch \
            file://Enable-more-tests-while-cross-compiling.patch \
@@ -14,6 +13,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-Do-not-ignore-return-value-of-write.patch \
            file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
            file://0001-Revert-Use-absolute-paths-in-pkg-config-files.patch \
+           file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
+           file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
+           file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
            "
 
 SRC_URI_append_class-native = " file://relocate-modules.patch"
meta/recipes-core/glib-2.0/glib.inc +21 -14
index a186c1d9eb6..4d7fdeebbbd 100644
@@ -29,7 +29,11 @@ PACKAGES += "${PN}-codegen ${PN}-utils"
 
 LEAD_SONAME = "libglib-2.0.*"
 
-inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
+inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
+
+# This avoids the need to depend on target python3, which in case of mingw is not even possible.
+# meson's python configuration pokes into python3 configuration, so this provides the native config to it.
+unset _PYTHON_SYSCONFIGDATA_NAME
 
 REQUIRED_DISTRO_FEATURES_libc-glibc = "${@'libc-charsets libc-locale-code libc-locales' if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d) else ''}"
 
@@ -37,21 +41,17 @@ S = "${WORKDIR}/glib-${PV}"
 
 PACKAGECONFIG ??= "system-pcre libmount"
 # To use the system pcre it must be configured with --enable-unicode-properties
-PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre"
-PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux"
-PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native"
-PACKAGECONFIG[libelf] = "--enable-libelf,--disable-libelf,elfutils"
-
-CORECONF = "--disable-dtrace --disable-fam --disable-systemtap"
+PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre"
+PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux"
+PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
+# libelf is auto-detected without a configuration option
+PACKAGECONFIG[libelf] = ",,elfutils"
 
-PRINTF = "--enable-included-printf=no"
-PRINTF_darwin = "--enable-included-printf=yes"
-PRINTF_mingw32 = "--enable-included-printf=yes"
-EXTRA_OECONF = "${PRINTF} ${CORECONF}"
-EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
+CORECONF = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false"
 
-# Tell configure that we'll have dbus-daemon on the target for the tests
-EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}"
+EXTRA_OEMESON = "${CORECONF} ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}"
+EXTRA_OEMESON_class-native = "${CORECONF} -Dinstalled_tests=false"
+EXTRA_OEMESON_class-nativesdk = "${CORECONF} -Dinstalled_tests=false"
 
 do_configure_prepend() {
 	sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
@@ -117,6 +117,8 @@ do_install_append () {
         if test "x${MLPREFIX}" != "x"; then
                 mv ${D}${libexecdir}/gio-querymodules${EXEEXT} ${D}${libexecdir}/${MLPREFIX}gio-querymodules${EXEEXT}
         fi
+        # Autotools does this, meson does not
+        mkdir -p ${D}${libdir}/gio/modules
 }
 
 do_install_append_class-target () {
@@ -129,6 +131,11 @@ do_install_append_class-target () {
 	fi
 }
 
+# As we do not build python3 for windows, makes no sense to ship the script that's using it
+do_install_append_mingw32() {
+        rm -f ${D}${bindir}/gtester-report
+}
+
 CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml"
 CODEGEN_PYTHON_RDEPENDS_mingw32 = ""
 
Signature · 1 line
2.17.1
#16 lore raw

Re: [PATCH 4/4] glib-2.0: convert from autotools to meson

packages/corei7-64-poky-linux/glib-2.0/glib-2.0-doc: PKGSIZE changed from 21195094 to 117168 (-99%)

Documentation is no longer built.

Ross