diff options
Diffstat (limited to 'yocto-poky/meta/recipes-core/glib-2.0')
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | 31 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | 81 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch | 39 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | 22 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch | 59 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 49 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 4 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch (renamed from yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch) | 20 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb (renamed from yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb) | 13 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-core/glib-2.0/glib.inc | 60 |
10 files changed, 299 insertions, 79 deletions
diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch new file mode 100644 index 000000000..561d10020 --- /dev/null +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -0,0 +1,31 @@ +From 80682c171ccb27d01343d4cfcfb4dd49b7863ccc Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 22 Mar 2016 15:14:58 +0200 +Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM + +We want to install this binary with the gio library, and debian +renamer does not cope with library packages with files in ${bindir} + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [OE specific] +--- + gio/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gio/Makefile.am b/gio/Makefile.am +index b7f91cc..4d81cc0 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -702,7 +702,8 @@ gio.def: libgio-2.0.la + gio-2.0.lib: libgio-2.0.la gio.def + $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ + +-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings ++bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings ++libexec_PROGRAMS = gio-querymodules + + glib_compile_resources_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch new file mode 100644 index 000000000..f1e688cac --- /dev/null +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -0,0 +1,81 @@ +From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 9 Nov 2015 11:07:27 +0200 +Subject: [PATCH] Enable more tests while cross-compiling + +Upstream disables a few tests while cross-compiling because their build requires +running other built binaries. This usually makes sense but in the cross-compile +case we can depend on glib-2.0-native. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + gio/tests/Makefile.am | 8 +++----- + tests/gobject/Makefile.am | 8 +++----- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am +index 868873f..533e454 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am +@@ -503,10 +503,9 @@ test_programs += \ + endif + + # ----------------------------------------------------------------------------- +-# The resources test is a bit more complicated, and we cannot build it when +-# cross-compiling GIO because it requires running a binary... ++# The resources test is a bit more complicated, and requires glib-native ++# for running a binary + +-if !CROSS_COMPILING + test_programs += resources + resources_SOURCES = resources.c + nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h +@@ -528,7 +527,11 @@ if !ENABLE_INSTALLED_TESTS + libresourceplugin_la_LDFLAGS += -rpath / + endif + ++if !CROSS_COMPILING + glib_compile_resources=$(top_builddir)/gio/glib-compile-resources ++else ++glib_compile_resources=glib-compile-resources ++endif + + resources.o: test_resources2.h + test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml) +@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- + + EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml + CLEANFILES += test_resources.c test_resources2.[ch] plugin_resources.c test.gresource +-endif # !CROSS_COMPILING + + BUILT_SOURCES += giotypefuncs.c + +diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am +index 16f2827..4c2208e 100644 +--- a/tests/gobject/Makefile.am ++++ b/tests/gobject/Makefile.am +@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP + installed_test_programs += timeloop-closure + endif + +-# The marshal test requires running a binary, which means we cannot +-# build it when cross-compiling ++# The marshal test requires running a binary, which means we require ++# glib-native when cross-compiling + if !CROSS_COMPILING + glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal ++else ++glib_genmarshal=$(shell which glib-genmarshal) ++endif + + testmarshal.h: stamp-testmarshal.h + @true +@@ -69,7 +72,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c + CLEANFILES += stamp-testmarshal.h + EXTRA_DIST += testcommon.h testmarshal.list + BUILT_EXTRA_DIST += testmarshal.h testmarshal.c +-endif # !CROSS_COMPILING + + dist-hook: $(BUILT_EXTRA_DIST) + files='$(BUILT_EXTRA_DIST)'; \ diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch deleted file mode 100644 index 3aac35a5d..000000000 --- a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/add-march-i486-into-CFLAGS-automatically.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 55253b55b9c65f3e0efbbe03cbab2a4c4014a16b Mon Sep 17 00:00:00 2001 -From: Song.Li <Song.Li@windriver.com> -Date: Thu, 5 Jul 2012 15:09:41 +0800 -Subject: [PATCH] add -march=i486 into CFLAGS automatically - -Upstream-Status: Inappropriate [configuration] - -glib configure will check if current gcc need -march=i486, -when gcc need -march=i486 but CFLAGS don't have, -glib configure will abort and advise the user to add -march=i486 or later. -This will break the build process,it's not good for automatic build system. -so change this to adding -march=i485 automatically when it is needed. ---- - configure.ac | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -Index: glib-2.36.0/configure.ac -=================================================================== ---- glib-2.36.0.orig/configure.ac -+++ glib-2.36.0/configure.ac -@@ -2378,7 +2378,7 @@ dnl - dnl Note that the atomic ops are only available with GCC on x86 when - dnl using -march=i486 or higher. If we detect that the atomic ops are - dnl not available but would be available given the right flags, we want --dnl to abort and advise the user to fix their CFLAGS. It's better to do -+dnl to add -march=i486 automatically to fix their CFLAGS. It's better to do - dnl that then to silently fall back on emulated atomic ops just because - dnl the user had the wrong build environment. - -@@ -2401,7 +2401,8 @@ AC_CACHE_CHECK([for lock-free atomic int - AC_TRY_COMPILE([], - [volatile int atomic = 2;\ - __sync_bool_compare_and_swap (&atomic, 2, 3);], -- [AC_MSG_ERROR([GLib must be build with -march=i486 or later.])], -+ [AC_MSG_WARN([GLib must be build with -march=i486 or later.]) -+ SAVE_CFLAGS="${SAVE_CFLAGS} -march=i486"], - []) - CFLAGS="${SAVE_CFLAGS}" - fi diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch index 1d69a3f29..aa5de27d1 100644 --- a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch @@ -1,4 +1,4 @@ -From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 +From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 28 Apr 2012 18:24:50 +0200 Subject: [PATCH] configure: use $host_alias-libtool instead of libtool @@ -13,19 +13,20 @@ from PATH though Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> +Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com> Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - configure.ac | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index a6478c6..9a93d60 100644 +index 1af90c5..f6b7a73 100644 --- a/configure.ac +++ b/configure.ac -@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then +@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then G_MODULE_LDFLAGS= else export SED @@ -34,7 +35,7 @@ index a6478c6..9a93d60 100644 fi dnl G_MODULE_IMPL= don't reset, so cmd-line can override G_MODULE_NEED_USCORE=0 -@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then +@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness echo "void glib_plugin_test(void) { }" > plugin.c @@ -46,7 +47,12 @@ index a6478c6..9a93d60 100644 ${LDFLAGS} -module -o plugin.la -export-dynamic \ -shrext ".o" -avoid-version plugin.lo \ -rpath /dont/care >/dev/null 2>&1 -@@ -1614,7 +1614,7 @@ fi +- eval `./libtool --config | grep ^objdir` ++ eval `./$host_alias-libtool --config | grep ^objdir` + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ + AC_TRY_RUN([ +@@ -1506,7 +1506,7 @@ fi AC_MSG_CHECKING(for the suffix of module shared libraries) export SED @@ -56,5 +62,5 @@ index a6478c6..9a93d60 100644 module=yes eval std_shrext=$shrext_cmds # chop the initial dot -- -1.7.8.6 +1.9.1 diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch new file mode 100644 index 000000000..dc62b92ef --- /dev/null +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/gi-exclude.patch @@ -0,0 +1,59 @@ +The autoptr types should be excluded from gobject-introspection parsing as +they're not user-facing. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h +index a95ba65..24ccc2d 100644 +--- a/gio/gio-autocleanups.h ++++ b/gio/gio-autocleanups.h +@@ -21,6 +21,8 @@ + #error "Only <gio/gio.h> can be included directly." + #endif + ++#ifndef __GI_SCANNER__ ++ + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAction, g_object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GActionMap, g_object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAppInfo, g_object_unref) +@@ -146,3 +148,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolume, g_object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolumeMonitor, g_object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibCompressor, g_object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibDecompressor, g_object_unref) ++ ++#endif +diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h +index 6355f75..09d28be 100644 +--- a/glib/glib-autocleanups.h ++++ b/glib/glib-autocleanups.h +@@ -21,6 +21,8 @@ + #error "Only <glib.h> can be included directly." + #endif + ++#ifndef __GI_SCANNER__ ++ + static inline void + g_autoptr_cleanup_generic_gfree (void *p) + { +@@ -87,3 +89,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantDict, g_variant_dict_unref) + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GVariantDict, g_variant_dict_clear) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantType, g_variant_type_free) + G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL) ++ ++#endif +diff --git a/gobject/gobject-autocleanups.h b/gobject/gobject-autocleanups.h +index 980203f..a1d4ba1 100644 +--- a/gobject/gobject-autocleanups.h ++++ b/gobject/gobject-autocleanups.h +@@ -21,6 +21,10 @@ + #error "Only <glib-object.h> can be included directly." + #endif + ++#ifndef __GI_SCANNER__ ++ + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GObject, g_object_unref) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref) + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset) ++ ++#endif diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch new file mode 100644 index 000000000..f9e3f3dba --- /dev/null +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -0,0 +1,49 @@ +Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to +determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. + +This solves relocation problems with GIOModule for native builds of glib. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/gio/giomodule.c b/gio/giomodule.c +index 56c498c..a2e32b7 100644 +--- a/gio/giomodule.c ++++ b/gio/giomodule.c +@@ -47,6 +47,27 @@ + #include "gdesktopappinfo.h" + #endif + ++#include <dlfcn.h> ++ ++/* ++ * Generate a GIO module directory based on where glib is installed ++ */ ++static const char * ++_get_gio_module_dir (void) ++{ ++ Dl_info info; ++ ++ if (dladdr (g_io_module_new, &info)) { ++ char *libdir = g_path_get_dirname (info.dli_fname); ++ char *dir = g_build_filename (libdir, "gio", "modules", NULL); ++ g_free (libdir); ++ return dir; ++ } else { ++ return GIO_MODULE_DIR; ++ } ++} ++ ++ + /** + * SECTION:giomodule + * @short_description: Loadable GIO Modules +@@ -1057,7 +1078,7 @@ _g_io_modules_ensure_loaded (void) + /* Then load the compiled in path */ + module_dir = g_getenv ("GIO_MODULE_DIR"); + if (module_dir == NULL) +- module_dir = GIO_MODULE_DIR; ++ module_dir = _get_gio_module_dir (); + + g_io_modules_scan_all_in_directory_with_scope (module_dir, scope); + diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index 130ae09b6..5b85e8fab 100644 --- a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -1,3 +1,5 @@ #! /bin/sh -gnome-desktop-testing-runner glib +useradd glib2-test +su glib2-test -c gnome-desktop-testing-runner glib +userdel glib2-test diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch index 2a154fdd4..7aa6217d6 100644 --- a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc.patch +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch @@ -5,16 +5,18 @@ based systems therefore lets set DATADIRNAME to "share". Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: glib-2.38.2/m4macros/glib-gettext.m4 +Index: glib-2.46.1/m4macros/glib-gettext.m4 =================================================================== ---- glib-2.38.2.orig/m4macros/glib-gettext.m4 2013-11-07 07:29:13.000000000 -0800 -+++ glib-2.38.2/m4macros/glib-gettext.m4 2014-03-15 14:51:54.712135644 -0700 -@@ -239,7 +239,7 @@ - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-linux-uclibc*) +--- glib-2.46.1.orig/m4macros/glib-gettext.m4 ++++ glib-2.46.1/m4macros/glib-gettext.m4 +@@ -243,6 +243,10 @@ msgstr "" CATOBJEXT=.mo DATADIRNAME=share ;; ++ *-*-musl* | *-*-linux-uclibc*) ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++ ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb index 1e3d36af1..8e445b415 100644 --- a/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb @@ -7,17 +7,20 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://fix-conflicting-rand.patch \ - file://add-march-i486-into-CFLAGS-automatically.patch \ file://glib-2.0-configure-readlink.patch \ file://run-ptest \ file://ptest-paths.patch \ - file://uclibc.patch \ + file://uclibc_musl_translation.patch \ file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ file://allow-run-media-sdX-drive-mount-if-username-root.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ + file://Enable-more-tests-while-cross-compiling.patch \ + file://gi-exclude.patch \ + file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ " -SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" +SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ + file://relocate-modules.patch" -SRC_URI[md5sum] = "83efba4722a9674b97437d1d99af79db" -SRC_URI[sha256sum] = "8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07" +SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e" +SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db" diff --git a/yocto-poky/meta/recipes-core/glib-2.0/glib.inc b/yocto-poky/meta/recipes-core/glib-2.0/glib.inc index 072f79011..e764fad13 100644 --- a/yocto-poky/meta/recipes-core/glib-2.0/glib.inc +++ b/yocto-poky/meta/recipes-core/glib-2.0/glib.inc @@ -17,20 +17,23 @@ SECTION = "libs" BBCLASSEXTEND = "native nativesdk" -DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" -DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" +DEPENDS = "virtual/libiconv libffi zlib glib-2.0-native" +DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' dbus', '', d)}" DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" -DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native" +DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native" -PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" +PACKAGES += "${PN}-codegen ${PN}-utils" LEAD_SONAME = "libglib-2.0.*" -FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" -inherit autotools gettext gtk-doc pkgconfig ptest-gnome +inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache S = "${WORKDIR}/glib-${PV}" +PACKAGECONFIG ??= "system-pcre" +# To use the system pcre it must be configured with --enable-unicode-properties +PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" + CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" PRINTF = "--enable-included-printf=no" @@ -44,19 +47,27 @@ do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in } -FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas \ - ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" +FILES_${PN} = "${libdir}/lib*${SOLIBS} \ + ${libdir}/gio \ + ${libexecdir}/*gio-querymodules \ + ${datadir}/glib-2.0/schemas" FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ - ${libdir}/gio/modules/*.la" -FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ - ${libdir}/gio/modules/.debug \ - ${libdir}/glib-2.0/installed-tests/glib/.debug" -FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" -FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ - ${datadir}/bash-completion" - -ARM_INSTRUCTION_SET = "arm" + ${libdir}/gio/modules/*.la \ + ${bindir}/glib-genmarshal \ + ${bindir}/glib-gettextize \ + ${bindir}/glib-mkenums \ + ${bindir}/glib-compile-resources \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ + ${datadir}/glib-2.0/schemas/gschema.dtd" +FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" +FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ + ${bindir}/gdbus-codegen" +FILES_${PN}-utils = "${bindir}/*" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + USE_NLS = "yes" do_install_append () { @@ -73,6 +84,21 @@ do_install_append () { if [ -f ${D}${bindir}/glib-mkenums ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums fi + + if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then + if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false", "true", d)}; then + rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test + fi + fi + + # Make sure gio-querymodules is unique among multilibs + if test "x${MLPREFIX}" != "x"; then + mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules + fi +} + +do_install_append_libc-musl () { + rm -f ${D}${libdir}/charset.alias } RDEPENDS_${PN}-ptest += "\ |
