diff options
Diffstat (limited to 'poky/meta/recipes-core')
52 files changed, 531 insertions, 562 deletions
diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/poky/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch index d45b75869a..d45b75869a 100644 --- a/poky/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ b/poky/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/poky/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index b0bc6b97a6..b0bc6b97a6 100644 --- a/poky/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/poky/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/parallel.patch b/poky/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch index d96a376b7d..d96a376b7d 100644 --- a/poky/meta/recipes-core/gettext/gettext-0.21/parallel.patch +++ b/poky/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/run-ptest b/poky/meta/recipes-core/gettext/gettext-0.21.1/run-ptest index f17f3c87a7..f17f3c87a7 100644 --- a/poky/meta/recipes-core/gettext/gettext-0.21/run-ptest +++ b/poky/meta/recipes-core/gettext/gettext-0.21.1/run-ptest diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch b/poky/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch index 93f7c03334..93f7c03334 100644 --- a/poky/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch +++ b/poky/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch b/poky/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch index fc77feb270..c12e0d3b88 100644 --- a/poky/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch +++ b/poky/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch @@ -1,4 +1,4 @@ -From 15647f679834be633fb4a9aeff4671b9cb95ccb8 Mon Sep 17 00:00:00 2001 +From 38c361e6860bfaefbefeccae621e698c301879f2 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 23 Jan 2018 00:54:13 +0000 Subject: [PATCH] gettext: beat library detection into shape @@ -14,18 +14,18 @@ Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config] Signed-off-by: Ross Burton <ross.burton@intel.com> --- - gettext-tools/gnulib-m4/libxml.m4 | 99 +---------------- - .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +-- - libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++-------------- - libtextstyle/gnulib-local/m4/libglib.m4 | 100 +++--------------- - libtextstyle/gnulib-m4/libcroco.m4 | 99 +++-------------- - libtextstyle/gnulib-m4/libglib.m4 | 100 +++--------------- - libtextstyle/lib/term-styled-ostream.c | 12 +-- - libtextstyle/lib/term-styled-ostream.oo.c | 12 +-- - 8 files changed, 83 insertions(+), 450 deletions(-) + gettext-tools/gnulib-m4/libxml.m4 | 105 +---------------- + .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +- + libtextstyle/gnulib-local/m4/libcroco.m4 | 98 +++------------- + libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++--------------- + libtextstyle/gnulib-m4/libcroco.m4 | 98 +++------------- + libtextstyle/gnulib-m4/libglib.m4 | 106 +++--------------- + libtextstyle/lib/term-styled-ostream.c | 12 +- + libtextstyle/lib/term-styled-ostream.oo.c | 12 +- + 8 files changed, 79 insertions(+), 470 deletions(-) diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 -index 2f80c37..30ce58e 100644 +index 0340490..0355388 100644 --- a/gettext-tools/gnulib-m4/libxml.m4 +++ b/gettext-tools/gnulib-m4/libxml.m4 @@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) @@ -36,7 +36,7 @@ index 2f80c37..30ce58e 100644 AC_REQUIRE([AM_ICONV_LINK]) ifelse([$1], , [ -@@ -30,100 +31,10 @@ AC_DEFUN([gl_LIBXML], +@@ -30,106 +31,10 @@ AC_DEFUN([gl_LIBXML], INCXML= ifelse([$1], [yes], , [ if test "$gl_cv_libxml_use_included" != yes; then @@ -60,14 +60,16 @@ index 2f80c37..30ce58e 100644 - dnl -Wl,--disable-auto-import. - AC_LIB_LINKFLAGS_BODY([xml2]) - LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <libxml/xmlversion.h> +- #include <libxml/xmlmemory.h> +- #include <libxml/xpath.h> +- ]], +- [[xmlCheckVersion (0); +- xmlFree ((void *) 0); +- xmlXPathSetContextNode ((void *)0, (void *)0); +- ]])], - [gl_cv_libxml=yes - gl_cv_LIBXML="$LIBXML2 $LIBICONV" - gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" @@ -75,14 +77,16 @@ index 2f80c37..30ce58e 100644 - if test "$gl_cv_libxml" != yes; then - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCXML2" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <libxml/xmlversion.h> +- #include <libxml/xmlmemory.h> +- #include <libxml/xpath.h> +- ]], +- [[xmlCheckVersion (0); +- xmlFree ((void *) 0); +- xmlXPathSetContextNode ((void *)0, (void *)0); +- ]])], - [gl_cv_libxml=yes - gl_cv_LIBXML="$LIBXML2 $LIBICONV" - gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" @@ -94,26 +98,28 @@ index 2f80c37..30ce58e 100644 - dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is - dnl self-contained. - libxml2_include_dir= -- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>], +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <libxml2/libxml/xmlexports.h>]])], - [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h]) - libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'` - ]) - if test -z "$libxml2_include_dir"; then -- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>], +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <libxml2/libxml/xmlversion.h>]])], - [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h]) - libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'` - ]) - fi - if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then - CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <libxml/xmlversion.h> +- #include <libxml/xmlmemory.h> +- #include <libxml/xpath.h> +- ]], +- [[xmlCheckVersion (0); +- xmlFree ((void *) 0); +- xmlXPathSetContextNode ((void *)0, (void *)0); +- ]])], - [gl_cv_libxml=yes - gl_cv_LIBXML="$LIBXML2 $LIBICONV" - gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" @@ -168,17 +174,10 @@ index 2ff978f..5ffb17a 100644 #include "term-ostream.h" #include "mem-hash-map.h" diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 -index bc53cc6..10b2455 100644 +index 39e72b1..042915a 100644 --- a/libtextstyle/gnulib-local/m4/libcroco.m4 +++ b/libtextstyle/gnulib-local/m4/libcroco.m4 -@@ -1,99 +1,34 @@ --# libcroco.m4 serial 3 --dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. -+# libcroco.m4 serial 2 (gettext-0.17) -+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. +@@ -6,97 +6,29 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -233,8 +232,9 @@ index bc53cc6..10b2455 100644 - dnl one that built the library. - AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) - LIBS="$gl_save_LIBS $LIBCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]], +- [[const char *version = LIBCROCO_VERSION; return !version;]])], - [gl_cv_libcroco=yes - gl_cv_LIBCROCO="$LIBCROCO_0_6" - gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" @@ -242,8 +242,9 @@ index bc53cc6..10b2455 100644 - if test "$gl_cv_libcroco" != yes; then - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]], +- [[const char *version = LIBCROCO_VERSION; return !version;]])], - [gl_cv_libcroco=yes - gl_cv_LIBCROCO="$LIBCROCO_0_6" - gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" @@ -252,8 +253,9 @@ index bc53cc6..10b2455 100644 - if test "$gl_cv_libcroco" != yes; then - dnl Often the include files are installed in - dnl /usr/include/libcroco-0.6/libcroco. -- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]], +- [[const char *version = LIBCROCO_VERSION; return !version;]])], - [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) - libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` - if test -d "$libcroco_include_dir"; then @@ -289,10 +291,10 @@ index bc53cc6..10b2455 100644 AC_SUBST([LTLIBCROCO]) AC_SUBST([INCCROCO]) diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 -index 5853772..767fba2 100644 +index 7ee5029..bb1e5e4 100644 --- a/libtextstyle/gnulib-local/m4/libglib.m4 +++ b/libtextstyle/gnulib-local/m4/libglib.m4 -@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. +@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -340,12 +342,14 @@ index 5853772..767fba2 100644 - dnl one that built the library. - AC_LIB_LINKFLAGS_BODY([glib-2.0]) - LIBS="$gl_save_LIBS $LIBGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <glib.h> +- #ifndef G_BEGIN_DECLS +- error this glib.h includes a glibconfig.h from a glib version 1.x +- #endif +- ]], +- [[g_string_new ("foo");]])], - [gl_cv_libglib=yes - gl_cv_LIBGLIB="$LIBGLIB_2_0" - gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" @@ -353,12 +357,14 @@ index 5853772..767fba2 100644 - if test "$gl_cv_libglib" != yes; then - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <glib.h> +- #ifndef G_BEGIN_DECLS +- error this glib.h includes a glibconfig.h from a glib version 1.x +- #endif +- ]], +- [[g_string_new ("foo");]])], - [gl_cv_libglib=yes - gl_cv_LIBGLIB="$LIBGLIB_2_0" - gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" @@ -369,12 +375,14 @@ index 5853772..767fba2 100644 - dnl and /usr/lib/glib-2.0/include. - if test -n "$LIBGLIB_2_0_PREFIX"; then - CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <glib.h> +- #ifndef G_BEGIN_DECLS +- error this glib.h includes a glibconfig.h from a glib version 1.x +- #endif +- ]], +- [[g_string_new ("foo");]])], - [gl_cv_libglib=yes - gl_cv_LIBGLIB="$LIBGLIB_2_0" - gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" @@ -407,17 +415,10 @@ index 5853772..767fba2 100644 AC_SUBST([LTLIBGLIB]) AC_SUBST([INCGLIB]) diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4 -index bc53cc6..10b2455 100644 +index 39e72b1..042915a 100644 --- a/libtextstyle/gnulib-m4/libcroco.m4 +++ b/libtextstyle/gnulib-m4/libcroco.m4 -@@ -1,99 +1,34 @@ --# libcroco.m4 serial 3 --dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. -+# libcroco.m4 serial 2 (gettext-0.17) -+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. +@@ -6,97 +6,29 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -472,8 +473,9 @@ index bc53cc6..10b2455 100644 - dnl one that built the library. - AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) - LIBS="$gl_save_LIBS $LIBCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]], +- [[const char *version = LIBCROCO_VERSION; return !version;]])], - [gl_cv_libcroco=yes - gl_cv_LIBCROCO="$LIBCROCO_0_6" - gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" @@ -481,8 +483,9 @@ index bc53cc6..10b2455 100644 - if test "$gl_cv_libcroco" != yes; then - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]], +- [[const char *version = LIBCROCO_VERSION; return !version;]])], - [gl_cv_libcroco=yes - gl_cv_LIBCROCO="$LIBCROCO_0_6" - gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" @@ -491,8 +494,9 @@ index bc53cc6..10b2455 100644 - if test "$gl_cv_libcroco" != yes; then - dnl Often the include files are installed in - dnl /usr/include/libcroco-0.6/libcroco. -- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include <libcroco-config.h>]], +- [[const char *version = LIBCROCO_VERSION; return !version;]])], - [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) - libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` - if test -d "$libcroco_include_dir"; then @@ -528,10 +532,10 @@ index bc53cc6..10b2455 100644 AC_SUBST([LTLIBCROCO]) AC_SUBST([INCCROCO]) diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 -index 5853772..767fba2 100644 +index 7ee5029..bb1e5e4 100644 --- a/libtextstyle/gnulib-m4/libglib.m4 +++ b/libtextstyle/gnulib-m4/libglib.m4 -@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. +@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -579,12 +583,14 @@ index 5853772..767fba2 100644 - dnl one that built the library. - AC_LIB_LINKFLAGS_BODY([glib-2.0]) - LIBS="$gl_save_LIBS $LIBGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <glib.h> +- #ifndef G_BEGIN_DECLS +- error this glib.h includes a glibconfig.h from a glib version 1.x +- #endif +- ]], +- [[g_string_new ("foo");]])], - [gl_cv_libglib=yes - gl_cv_LIBGLIB="$LIBGLIB_2_0" - gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" @@ -592,12 +598,14 @@ index 5853772..767fba2 100644 - if test "$gl_cv_libglib" != yes; then - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <glib.h> +- #ifndef G_BEGIN_DECLS +- error this glib.h includes a glibconfig.h from a glib version 1.x +- #endif +- ]], +- [[g_string_new ("foo");]])], - [gl_cv_libglib=yes - gl_cv_LIBGLIB="$LIBGLIB_2_0" - gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" @@ -608,12 +616,14 @@ index 5853772..767fba2 100644 - dnl and /usr/lib/glib-2.0/include. - if test -n "$LIBGLIB_2_0_PREFIX"; then - CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include <glib.h> +- #ifndef G_BEGIN_DECLS +- error this glib.h includes a glibconfig.h from a glib version 1.x +- #endif +- ]], +- [[g_string_new ("foo");]])], - [gl_cv_libglib=yes - gl_cv_LIBGLIB="$LIBGLIB_2_0" - gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch b/poky/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch deleted file mode 100644 index 727d1db552..0000000000 --- a/poky/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2f127ebe425c97b0641fe1bc73247e91e18c2be0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Thu, 11 Nov 2021 22:06:16 +0100 -Subject: [PATCH] libtextstyle: fix builds with automake 1.16.4 and newer - -Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?59929] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - libtextstyle/configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac -index 63b4c2a..cab9025 100644 ---- a/libtextstyle/configure.ac -+++ b/libtextstyle/configure.ac -@@ -17,11 +17,10 @@ dnl along with this program. If not, see <https://www.gnu.org/licenses/>. - dnl Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.63]) --AC_INIT -+AC_INIT([libtextstyle], -+ [0.20.1]) - AC_CONFIG_SRCDIR([version.sh]) - AC_CONFIG_AUX_DIR([build-aux]) --. $srcdir/version.sh --gl_INIT_PACKAGE([libtextstyle], [$VERSION_NUMBER]) - AM_INIT_AUTOMAKE([1.13 silent-rules]) - AM_CONFIG_HEADER([config.h]) - diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch b/poky/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch deleted file mode 100644 index e42a6c0a4d..0000000000 --- a/poky/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 71988f83b69c4ed98d1b9418da80edf11a931894 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 23 Sep 2020 22:08:34 -0700 -Subject: [PATCH] msgmerge-29: Add executable file mode bits - -This script is installed with default mode bits and executed directly -e.g ./msgmerge-29 when doing make check which results in - -/bin/bash: line 9: ./msgmerge-29: Permission denied - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gettext-tools/tests/msgmerge-29 | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - mode change 100644 => 100755 gettext-tools/tests/msgmerge-29 - -diff --git a/gettext-tools/tests/msgmerge-29 b/gettext-tools/tests/msgmerge-29 -old mode 100644 -new mode 100755 --- -2.28.0 - diff --git a/poky/meta/recipes-core/gettext/gettext-0.21/mingw.patch b/poky/meta/recipes-core/gettext/gettext-0.21/mingw.patch deleted file mode 100644 index b062c784f6..0000000000 --- a/poky/meta/recipes-core/gettext/gettext-0.21/mingw.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7cf68dffb2adb76375bfb0781e277510523a1f3e Mon Sep 17 00:00:00 2001 -From: Michele Locati <michele@locati.it> -Date: Thu, 30 Jul 2020 18:58:02 +0200 -Subject: [PATCH] build: Fix build failure on Cygwin and mingw. - -* gettext-tools/woe32dll/gettextsrc-exports.c: Export formatstring_ruby. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gettext-tools/woe32dll/gettextsrc-exports.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c -index 4477ae8..6d76089 100644 ---- a/gettext-tools/woe32dll/gettextsrc-exports.c -+++ b/gettext-tools/woe32dll/gettextsrc-exports.c -@@ -50,6 +50,7 @@ VARIABLE(formatstring_python) - VARIABLE(formatstring_python_brace) - VARIABLE(formatstring_qt) - VARIABLE(formatstring_qt_plural) -+VARIABLE(formatstring_ruby) - VARIABLE(formatstring_scheme) - VARIABLE(formatstring_sh) - VARIABLE(formatstring_smalltalk) --- -1.9.1 - diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING index 3671ab6985..3671ab6985 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/Makefile.in.in index 6b25f0d916..6b25f0d916 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/Makefile.in.in diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/gettext.m4 index 4f25a27d93..f4492405bd 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 71 (gettext-0.20.2) +# gettext.m4 serial 72 (gettext-0.21.1) dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -55,22 +55,22 @@ dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], , + m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])]) - ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. ])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , + m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) define([gt_included_intl], - ifelse([$1], [external], [no], [yes])) + m4_if([$1], [external], [no], [yes])) gt_NEEDS_INIT AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ AC_REQUIRE([AM_INTL_SUBDIR])dnl ]) @@ -88,7 +88,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. - ifelse(gt_included_intl, yes, , [ + m4_if(gt_included_intl, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) @@ -98,7 +98,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Set USE_NLS. AC_REQUIRE([AM_NLS]) - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ]) @@ -118,7 +118,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], @@ -174,7 +174,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ + m4_if(gt_included_intl, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL @@ -261,7 +261,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION INCINTL= fi - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. @@ -273,8 +273,8 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION dnl Mark actions used to generate GNU NLS library. BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" + LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" + LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi @@ -341,7 +341,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION POSUB=po fi - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' dnl because some of the testsuite requires it. BUILD_INCLUDED_LIBINTL=yes diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/host-cpu-c-abi.m4 index 6db2aa25ae..b9223241b4 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/host-cpu-c-abi.m4 @@ -1,5 +1,5 @@ -# host-cpu-c-abi.m4 serial 13 -dnl Copyright (C) 2002-2020 Free Software Foundation, Inc. +# host-cpu-c-abi.m4 serial 15 +dnl Copyright (C) 2002-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -211,7 +211,7 @@ changequote([,])dnl # be generating 64-bit code. AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 + [[#if defined __powerpc64__ || defined __LP64__ int ok; #else error fail @@ -382,6 +382,9 @@ EOF #ifndef __ia64__ #undef __ia64__ #endif +#ifndef __loongarch64__ +#undef __loongarch64__ +#endif #ifndef __m68k__ #undef __m68k__ #endif @@ -605,7 +608,7 @@ changequote([,])dnl # be generating 64-bit code. AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 + [[#if defined __powerpc64__ || defined __LP64__ int ok; #else error fail diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/iconv.m4 index e593b7270a..00057953e3 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 21 -dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation, +# iconv.m4 serial 24 +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,6 +7,12 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. +AC_PREREQ([2.64]) + +dnl Note: AM_ICONV is documented in the GNU gettext manual +dnl <https://www.gnu.org/software/gettext/manual/html_node/AM_005fICONV.html>. +dnl Don't make changes that are incompatible with that documentation! + AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], [ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. @@ -86,8 +92,9 @@ AC_DEFUN([AM_ICONV_LINK], #endif ]], [[int result = 0; - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) @@ -225,8 +232,7 @@ AC_DEFUN([AM_ICONV_LINK], AC_SUBST([LTLIBICONV]) ]) -dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to -dnl avoid warnings like +dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". dnl This is tricky because of the way 'aclocal' is implemented: dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. @@ -234,54 +240,43 @@ dnl Otherwise aclocal's initial scan pass would miss the macro definition. dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. dnl Otherwise aclocal would emit many "Use of uninitialized value $1" dnl warnings. -m4_define([gl_iconv_AC_DEFUN], - m4_version_prereq([2.64], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [m4_ifdef([gl_00GNULIB], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [[AC_DEFUN( - [$1], [$2])]])])) -gl_iconv_AC_DEFUN([AM_ICONV], +AC_DEFUN_ONCE([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL([am_cv_proto_iconv], [ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ + AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature], + [gl_cv_iconv_nonconst], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include <stdlib.h> #include <iconv.h> extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - ]], - [[]])], - [am_cv_proto_iconv_arg1=""], - [am_cv_proto_iconv_arg1="const"]) - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([ - $am_cv_proto_iconv]) + ]], + [[]])], + [gl_cv_iconv_nonconst=yes], + [gl_cv_iconv_nonconst=no]) + ]) else dnl When compiling GNU libiconv on a system that does not have iconv yet, dnl pick the POSIX compliant declaration without 'const'. - am_cv_proto_iconv_arg1="" + gl_cv_iconv_nonconst=yes + fi + if test $gl_cv_iconv_nonconst = yes; then + iconv_arg1="" + else + iconv_arg1="const" fi - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], + AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1], [Define as const if the declaration of iconv() needs const.]) dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. m4_ifdef([gl_ICONV_H_DEFAULTS], [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - if test -n "$am_cv_proto_iconv_arg1"; then + if test $gl_cv_iconv_nonconst != yes; then ICONV_CONST="const" fi ]) diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/intlmacosx.m4 index ebd9937c1a..ecc88d6e74 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 8 (gettext-0.20.2) -dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014, 2016, 2019-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-ld.m4 index 98c348faff..934207a765 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 9 -dnl Copyright (C) 1996-2003, 2009-2020 Free Software Foundation, Inc. +# lib-ld.m4 serial 10 +dnl Copyright (C) 1996-2003, 2009-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -122,7 +122,7 @@ else *-*-aix*) AC_COMPILE_IFELSE( [AC_LANG_SOURCE( - [[#if defined __powerpc64__ || defined _ARCH_PPC64 + [[#if defined __powerpc64__ || defined __LP64__ int ok; #else error fail diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-link.m4 index eecf70ec76..3b75bcd0de 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 31 -dnl Copyright (C) 2001-2020 Free Software Foundation, Inc. +# lib-link.m4 serial 33 +dnl Copyright (C) 2001-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" ]) AC_ARG_WITH(PACK[-prefix], -[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib + --without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -631,7 +631,20 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ;; -l*) dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + dnl But on GNU systems, ignore -lc options, because + dnl - linking with libc is the default anyway, + dnl - linking with libc.a may produce an error + dnl "/usr/bin/ld: dynamic STT_GNU_IFUNC symbol `strcmp' with pointer equality in `/usr/lib/libc.a(strcmp.o)' can not be used when making an executable; recompile with -fPIE and relink with -pie" + dnl or may produce an executable that always crashes, see + dnl <https://lists.gnu.org/archive/html/grep-devel/2020-09/msg00052.html>. + dep=`echo "X$dep" | sed -e 's/^X-l//'` + if test "X$dep" != Xc \ + || case $host_os in + linux* | gnu* | k*bsd*-gnu) false ;; + *) true ;; + esac; then + names_next_round="$names_next_round $dep" + fi ;; *.la) dnl Handle this in the next round. Throw away the .la's diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-prefix.m4 index c8a0b464c2..999f712f5a 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 17 -dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc. +# lib-prefix.m4 serial 20 +dnl Copyright (C) 2001-2005, 2008-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -174,14 +174,14 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf], [AC_EGREP_CPP([Extensible Linking Format], - [#ifdef __ELF__ + [#if defined __ELF__ || (defined __linux__ && defined __EDG__) Extensible Linking Format #endif ], [gl_cv_elf=yes], [gl_cv_elf=no]) - ]) - if test $gl_cv_elf; then + ]) + if test $gl_cv_elf = yes; then # Extract the ELF class of a file (5th byte) in decimal. # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header if od -A x < /dev/null >/dev/null 2>/dev/null; then @@ -198,20 +198,23 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], echo } fi + # Use 'expr', not 'test', to compare the values of func_elfclass, because on + # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002, + # not 1 or 2. changequote(,)dnl case $HOST_CPU_C_ABI_32BIT in yes) # 32-bit ABI. acl_is_expected_elfclass () { - test "`func_elfclass | sed -e 's/[ ]//g'`" = 1 + expr "`func_elfclass | sed -e 's/[ ]//g'`" = 1 > /dev/null } ;; no) # 64-bit ABI. acl_is_expected_elfclass () { - test "`func_elfclass | sed -e 's/[ ]//g'`" = 2 + expr "`func_elfclass | sed -e 's/[ ]//g'`" = 2 > /dev/null } ;; *) diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/nls.m4 index 5a506fc4b5..7c11c90f52 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 6 (gettext-0.20.2) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2022 Free dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/po.m4 index 3778fd7aac..2f14f8e2b1 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 31 (gettext-0.20.2) -dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. +# po.m4 serial 32 (gettext-0.21.1) +dnl Copyright (C) 1995-2014, 2016, 2018-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -179,7 +179,9 @@ changequote([,])dnl # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang"*) useit=yes;; + "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) + useit=yes + ;; esac done if test $useit = yes; then @@ -379,7 +381,9 @@ changequote([,])dnl # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang"*) useit=yes;; + "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*) + useit=yes + ;; esac done if test $useit = yes; then diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/progtest.m4 index f28010aed1..4a5b0b4c6d 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 8 (gettext-0.20.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc. +# progtest.m4 serial 9 (gettext-0.21.1) +dnl Copyright (C) 1996-2003, 2005, 2008-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1996. -AC_PREREQ([2.50]) +AC_PREREQ([2.53]) # Search path for a program which passes the given test. @@ -61,7 +61,7 @@ AC_CACHE_VAL([ac_cv_path_$1], ;; *) ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do + for ac_dir in m4_if([$5], , $PATH, [$5]); do IFS="$ac_save_IFS" test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -77,12 +77,12 @@ AC_CACHE_VAL([ac_cv_path_$1], IFS="$ac_save_IFS" dnl If no 4th arg is given, leave the cache variable unset, dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +m4_if([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ])dnl ;; esac])dnl $1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +if test m4_if([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then AC_MSG_RESULT([$][$1]) else AC_MSG_RESULT([no]) diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/config.rpath index 24be79cfb6..1e1ab67906 100755 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2020 Free Software Foundation, Inc. +# Copyright 1996-2022 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -371,7 +371,7 @@ else hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -547,7 +547,7 @@ case "$host_os" in freebsd[23].*) library_names_spec='$libname$shrext$versuffix' ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) library_names_spec='$libname$shrext' ;; gnu*) diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/remove-potcdate.sin index 8c70dfbf14..8c70dfbf14 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin +++ b/poky/meta/recipes-core/gettext/gettext-minimal-0.21.1/remove-potcdate.sin diff --git a/poky/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb b/poky/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb index 7a4dcbec57..7a4dcbec57 100644 --- a/poky/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb +++ b/poky/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb diff --git a/poky/meta/recipes-core/gettext/gettext_0.21.bb b/poky/meta/recipes-core/gettext/gettext_0.21.1.bb index 364e6a52a1..ec80a89e49 100644 --- a/poky/meta/recipes-core/gettext/gettext_0.21.bb +++ b/poky/meta/recipes-core/gettext/gettext_0.21.1.bb @@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', '& MIT', d)}" LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', 'file://libtextstyle/lib/libxml/COPYING;md5=2044417e2e5006b65a8b9067b683fcf1', d)}" # without croco in PACKAGECONFIG vendor copy of the lib will be used -LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'croco', '', 'file://libtextstyle/lib/libcroco/libcroco.h;md5=915a46e7307c2f7f8d2b9c503fc434ed;beginline=10;endline=28', d)}" +LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'croco', '', 'file://libtextstyle/lib/libcroco/libcroco.h;md5=424013a9ed5401aa58cf83f3188c6865;beginline=10;endline=28', d)}" # without glib in PACKAGECONFIG vendor copy of the lib will be used -LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'glib', '', 'file://libtextstyle/lib/glib/ghash.c;md5=af89a160226edf0b276b6183888037d0;beginline=10;endline=27', d)}" +LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'glib', '', 'file://libtextstyle/lib/glib/ghash.c;md5=e3159f5ac38dfe77af5cc0ee104dab2d;beginline=10;endline=27', d)}" DEPENDS = "gettext-native virtual/libiconv" @@ -29,11 +29,8 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://serial-tests-config.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ - file://mingw.patch \ - file://0001-msgmerge-29-Add-executable-file-mode-bits.patch \ - file://0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch \ " -SRC_URI[sha256sum] = "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12" +SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" inherit autotools texinfo pkgconfig ptest diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch deleted file mode 100644 index f3a0069633..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 16 Apr 2016 13:28:59 -0700 -Subject: [PATCH] Do not ignore return value of write() - -gcc warns about ignoring return value when compiling -with fortify turned on. - -assert when write() fails - -Upstream-Status: Submitted -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - glib/tests/unix.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/glib/tests/unix.c b/glib/tests/unix.c -index 7639d06..f941141 100644 ---- a/glib/tests/unix.c -+++ b/glib/tests/unix.c -@@ -33,14 +33,15 @@ test_pipe (void) - GError *error = NULL; - int pipefd[2]; - char buf[1024]; -- gssize bytes_read; -+ gssize bytes_read, bytes_written; - gboolean res; - - res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); - g_assert (res); - g_assert_no_error (error); - -- write (pipefd[1], "hello", sizeof ("hello")); -+ bytes_written = write (pipefd[1], "hello", sizeof ("hello")); -+ g_assert (bytes_written != -1 && "write() failed"); - memset (buf, 0, sizeof (buf)); - bytes_read = read (pipefd[0], buf, sizeof(buf) - 1); - g_assert_cmpint (bytes_read, >, 0); diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 5fe3aa898e..9bdd99d8a2 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001 +From 4a41bf7b050168726cc4fad4c1c72fc7c18ab779 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files @@ -16,16 +16,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index 532b086..98468a3 100644 +index 36b5bad..137e75a 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -820,14 +820,14 @@ pkg.generate(libgio, +@@ -862,14 +862,14 @@ pkg.generate(libgio, 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), 'giomoduledir=' + pkgconfig_giomodulesdir, - 'gio=' + join_paths('${bindir}', 'gio'), -- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), -- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), +- 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), - 'gdbus=' + join_paths('${bindir}', 'gdbus'), - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), @@ -43,10 +43,10 @@ index 532b086..98468a3 100644 install_dir : glib_pkgconfigreldir, filebase : 'gio-2.0', diff --git a/glib/meson.build b/glib/meson.build -index aaf5f00..1e0992b 100644 +index c365901..c3d6601 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -375,9 +375,9 @@ pkg.generate(libglib, +@@ -397,9 +397,9 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 59de3fa969..2e1e2313e8 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -1,31 +1,31 @@ -From 4f327be49fd6ac5a77da6e48459b37f37a601977 Mon Sep 17 00:00:00 2001 +From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gio/tests/meson.build | 8 ++++---- glib/tests/meson.build | 2 +- meson.build | 3 +++ - tests/meson.build | 2 +- - 4 files changed, 9 insertions(+), 6 deletions(-) + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index abe676767c60..34b347815308 100644 +index f644aa2..64a8684 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -27,7 +27,7 @@ if build_machine.system() == 'linux' - endif # libutil.length() > 0 - endif # build_machine.system() == 'linux' +@@ -29,7 +29,7 @@ endif + + test_cpp_args = test_c_args -if host_machine.system() == 'windows' +if host_system == 'windows' common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -176,7 +176,7 @@ else +@@ -210,7 +210,7 @@ if have_dbus_daemon endif # Test programs buildable on UNIX only @@ -33,8 +33,8 @@ index abe676767c60..34b347815308 100644 +if host_system != 'windows' gio_tests += { 'file' : {}, - 'gdbus-peer' : { -@@ -434,7 +434,7 @@ if host_machine.system() != 'windows' + 'gdbus-peer-object-manager' : {}, +@@ -462,7 +462,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only @@ -43,7 +43,7 @@ index abe676767c60..34b347815308 100644 gio_tests += {'win32-streams' : {}} endif -@@ -504,7 +504,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif @@ -53,10 +53,10 @@ index abe676767c60..34b347815308 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index a0c64afe6ae9..48407f99569c 100644 +index db01b54..6950817 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -151,7 +151,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif @@ -66,10 +66,10 @@ index a0c64afe6ae9..48407f99569c 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index e0b14319fb58..f6756a3c7dfb 100644 +index 43bb468..5f9b59c 100644 --- a/meson.build +++ b/meson.build -@@ -54,6 +54,9 @@ else +@@ -43,6 +43,9 @@ else endif host_system = host_machine.system() @@ -79,19 +79,3 @@ index e0b14319fb58..f6756a3c7dfb 100644 if host_system == 'darwin' ios_test_code = '''#include <TargetConditionals.h> -diff --git a/tests/meson.build b/tests/meson.build -index 5ff99a4a8258..8a4dad0ccae7 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -53,7 +53,7 @@ test_extra_programs = { - 'assert-msg-test' : {}, - } - --if host_machine.system() != 'windows' -+if host_system != 'windows' - tests += { - 'timeloop' : {}, - } --- -2.34.1 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch index c33fa88a76..57ada66907 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch @@ -1,10 +1,11 @@ -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2990] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 14838522a706ebdcc3cdab661d4c368099fe3a4e Mon Sep 17 00:00:00 2001 +From 3c56ff21b9a5fe18f9cec9b97ae1788fdf5d563e Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Tue, 6 Jul 2021 19:26:03 +0100 Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2990] +Signed-off-by: Ross Burton <ross.burton@arm.com> + don't happen The access and creation time tests create a file, gets the time in @@ -20,15 +21,16 @@ Change the test to simply assert that the difference not negative to handle this case. This is the same fix as 289f8b, but that was just modification time. + --- gio/tests/g-file-info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c -index 59411c3a8..a213e4b92 100644 +index d9ad045..c9b12b0 100644 --- a/gio/tests/g-file-info.c +++ b/gio/tests/g-file-info.c -@@ -239,7 +239,7 @@ test_g_file_info_access_time (void) +@@ -307,7 +307,7 @@ test_g_file_info_access_time (void) g_assert_nonnull (dt_usecs); ts = g_date_time_difference (dt_usecs, dt); @@ -36,8 +38,8 @@ index 59411c3a8..a213e4b92 100644 + g_assert_cmpint (ts, >=, 0); g_assert_cmpint (ts, <, G_USEC_PER_SEC); - /* Try round-tripping the access time. */ -@@ -316,7 +316,7 @@ test_g_file_info_creation_time (void) + /* Try again with nanosecond precision. */ +@@ -442,7 +442,7 @@ test_g_file_info_creation_time (void) g_assert_nonnull (dt_usecs); ts = g_date_time_difference (dt_usecs, dt); @@ -45,7 +47,4 @@ index 59411c3a8..a213e4b92 100644 + g_assert_cmpint (ts, >=, 0); g_assert_cmpint (ts, <, G_USEC_PER_SEC); - /* Try round-tripping the creation time. */ --- -2.34.1 - + /* Try again with nanosecond precision. */ diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch new file mode 100644 index 0000000000..db08b5af55 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch @@ -0,0 +1,48 @@ +From fdbffaea2fa85c203cc6aacb5734acac65aeaa19 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 11 Nov 2022 13:12:42 +0100 +Subject: [PATCH] tests/meson.build: do not use can_run_host_binaries() + +can_run_host_binaries() returns true even when cross compiling, +if there is an executable wrapper defined that can run +cross-binaries under some kind of emulation. + +Unfortunately, custom_target() will not use the wrapper +and will attempt to execute the command directly. Until +this is addressed in meson upstream, we have to disable +these targets in cross scenarios. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3067] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + +--- + gio/tests/meson.build | 2 +- + glib/tests/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index 49cfa25ce..ea59656f9 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -652,7 +652,7 @@ if installed_tests_enabled + endforeach + endif + +-if meson.can_run_host_binaries() ++if not meson.is_cross_build() + + compiler_type = '--compiler=@0@'.format(cc.get_id()) + +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index 69508178e..e4f75f302 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -411,7 +411,7 @@ executable('testing-helper', 'testing-helper.c', + ) + + # some testing of gtester functionality +-if meson.can_run_host_binaries() and host_system != 'windows' ++if not meson.is_cross_build() and host_system != 'windows' + xmllint = find_program('xmllint', required: false) + if xmllint.found() + tmpsample_xml = custom_target('tmpsample.xml', diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch deleted file mode 100644 index f5c161fe04..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1f3c05529c0c9032ae0a289fb1f088b7541fc9b0 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/meson.build | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 3ed23a5..5df932a 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -253,7 +253,7 @@ if host_machine.system() != 'windows' - } - endif - -- if have_dbus_daemon -+ if true - annotate_args = [ - '--annotate', 'org.project.Bar', 'Key1', 'Value1', - '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -603,14 +603,14 @@ if installed_tests_enabled - endforeach - endif - --if not meson.is_cross_build() or meson.has_exe_wrapper() -+if meson.is_cross_build() - - compiler_type = '--compiler=@0@'.format(cc.get_id()) - - plugin_resources_c = custom_target('plugin-resources.c', - input : 'test4.gresource.xml', - output : 'plugin-resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -636,7 +636,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_gresource = custom_target('test.gresource', - input : 'test.gresource.xml', - output : 'test.gresource', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -649,7 +649,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_resources2_c = custom_target('test_resources2.c', - input : 'test3.gresource.xml', - output : 'test_resources2.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -662,7 +662,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_resources2_h = custom_target('test_resources2.h', - input : 'test3.gresource.xml', - output : 'test_resources2.h', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -676,7 +676,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - input : 'test2.gresource.xml', - depends : big_test_resource, - output : 'test_resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -689,7 +689,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - digit_test_resources_c = custom_target('digit_test_resources.c', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -702,7 +702,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - digit_test_resources_h = custom_target('digit_test_resources.h', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.h', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -744,11 +744,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - - ld = find_program('ld', required : false) - -- if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() -+ if not meson.is_cross_build() - test_gresource_binary = custom_target('test5.gresource', - input : 'test5.gresource.xml', - output : 'test5.gresource', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -762,7 +762,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_resources_binary_c = custom_target('test_resources_binary.c', - input : 'test5.gresource.xml', - output : 'test_resources_binary.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch new file mode 100644 index 0000000000..63cbf90ab2 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch @@ -0,0 +1,77 @@ +From 0ca5254c5d92aec675b76b4bfa72a6885cde6066 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net> +Date: Sat, 29 Oct 2022 04:30:52 +0200 +Subject: [PATCH] glib/gmacros: Always define NULL as nullptr in C++11 and + newer + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/0ca5254c5d92aec675b76b4bfa72a6885cde6066] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + glib/gmacros.h | 9 ++++++++- + glib/tests/cxx.cpp | 13 ------------- + 2 files changed, 8 insertions(+), 14 deletions(-) + +diff --git a/glib/gmacros.h b/glib/gmacros.h +index 5302841105..9fe8270822 100644 +--- a/glib/gmacros.h ++++ b/glib/gmacros.h +@@ -870,10 +870,17 @@ + */ + #ifndef NULL + # ifdef __cplusplus +-# define NULL (0L) ++# if __cplusplus >= 201103L ++# define NULL (nullptr) ++# else ++# define NULL (0L) ++# endif /* __cplusplus >= 201103L */ + # else /* !__cplusplus */ + # define NULL ((void*) 0) + # endif /* !__cplusplus */ ++#elif defined (__cplusplus) && __cplusplus >= 201103L ++# undef NULL ++# define NULL (nullptr) + #endif + + #ifndef FALSE +diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp +index 6ac60791c8..045457c6e2 100644 +--- a/glib/tests/cxx.cpp ++++ b/glib/tests/cxx.cpp +@@ -34,21 +34,12 @@ test_typeof (void) + MyObject *obj3 = g_atomic_pointer_get (&obj2); + g_assert_true (obj3 == obj); + +-#if __cplusplus >= 201103L +- MyObject *obj4 = nullptr; +-#else + MyObject *obj4 = NULL; +-#endif + g_atomic_pointer_set (&obj4, obj3); + g_assert_true (obj4 == obj); + +-#if __cplusplus >= 201103L +- MyObject *obj5 = nullptr; +- g_atomic_pointer_compare_and_exchange (&obj5, nullptr, obj4); +-#else + MyObject *obj5 = NULL; + g_atomic_pointer_compare_and_exchange (&obj5, NULL, obj4); +-#endif + g_assert_true (obj5 == obj); + + MyObject *obj6 = g_steal_pointer (&obj5); +@@ -195,11 +186,7 @@ test_steal_pointer (void) + int + main (int argc, char *argv[]) + { +-#if __cplusplus >= 201103L +- g_test_init (&argc, &argv, nullptr); +-#else + g_test_init (&argc, &argv, NULL); +-#endif + + g_test_add_func ("/C++/typeof", test_typeof); + g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); +-- +GitLab + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch new file mode 100644 index 0000000000..763d5ce539 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch @@ -0,0 +1,31 @@ +From 7dc19632f3115e3f517c6bc80436fe72c1dcdeb4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net> +Date: Sat, 29 Oct 2022 04:16:00 +0200 +Subject: [PATCH] glib/tests/cxx: Ensure NULL is always casted to a pointer + type + +Otherwise it may not be recognized as valid sentinel +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/7dc19632f3115e3f517c6bc80436fe72c1dcdeb4] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + glib/tests/cxx.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp +index 045457c6e2..aa5e0cb576 100644 +--- a/glib/tests/cxx.cpp ++++ b/glib/tests/cxx.cpp +@@ -186,7 +186,11 @@ test_steal_pointer (void) + int + main (int argc, char *argv[]) + { ++#if __cplusplus >= 201103L + g_test_init (&argc, &argv, NULL); ++#else ++ g_test_init (&argc, &argv, static_cast<void *>(NULL)); ++#endif + + g_test_add_func ("/C++/typeof", test_typeof); + g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); +-- +GitLab diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index c0114397d8..7723ac6672 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From 9a66887179d28d696562dcac43ad05d67580cfdb Mon Sep 17 00:00:00 2001 +From 0da0b608fdbb144c39225233cbdd89995b76904b Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 2a043cc..e2d2310 100644 +index f5dbb4555..c926e77a8 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -56,6 +56,8 @@ +@@ -58,6 +58,8 @@ #ifdef G_OS_WIN32 #include "gregistrysettingsbackend.h" #include "giowin32-priv.h" @@ -31,7 +31,7 @@ index 2a043cc..e2d2310 100644 #endif #include <glib/gstdio.h> -@@ -1267,7 +1269,15 @@ get_gio_module_dir (void) +@@ -1261,7 +1263,15 @@ get_gio_module_dir (void) NULL); g_free (install_dir); #else diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index 7a231b514b..c476d67310 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -5,5 +5,6 @@ if id -u glib2-test; then userdel glib2-test fi useradd glib2-test +cd /tmp su glib2-test -c 'gnome-desktop-testing-runner glib' userdel glib2-test diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.1.bb index b5ab6502a3..8fd785a7fd 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.74.1.bb @@ -7,20 +7,21 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://run-ptest \ file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ - file://Enable-more-tests-while-cross-compiling.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ - file://0001-Do-not-ignore-return-value-of-write.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.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-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch \ + file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \ + file://cpp-null.patch \ + file://cpp-null2.patch \ " SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0" +SRC_URI[sha256sum] = "0ab981618d1db47845e56417b0d7c123f81a3427b2b9c93f5a46ff5bbb964964" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc index ffddefe22e..843b6bd29b 100644 --- a/poky/meta/recipes-core/glib-2.0/glib.inc +++ b/poky/meta/recipes-core/glib-2.0/glib.inc @@ -5,10 +5,10 @@ HOMEPAGE = "https://developer.gnome.org/glib/" # pcre is under BSD; # docs/reference/COPYING is with a 'public domain'-like license! LICENSE = "LGPL-2.1-or-later & BSD-3-Clause & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ - file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=41890f71f740302b785c27661123bff5 \ + file://glib/glib.h;beginline=4;endline=17;md5=72f7cc2847407f65d8981ef112e4e630 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=41890f71f740302b785c27661123bff5 \ + file://gmodule/gmodule.h;beginline=4;endline=17;md5=72f7cc2847407f65d8981ef112e4e630 \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" BUGTRACKER = "http://bugzilla.gnome.org" SECTION = "libs" @@ -21,7 +21,7 @@ DEPENDS = "glib-2.0-native \ virtual/libintl \ virtual/libiconv \ libffi \ - libpcre \ + libpcre2 \ zlib" PACKAGES += "${PN}-codegen ${PN}-utils" @@ -45,7 +45,7 @@ PACKAGECONFIG[libelf] = ",,elfutils" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" -EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false" +EXTRA_OEMESON = "-Ddtrace=false -Dsystemtap=false" do_configure:prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in @@ -54,6 +54,7 @@ do_configure:prepend() { FILES:${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ + ${libexecdir}/*gio-launch-desktop \ ${datadir}/glib-2.0/schemas" FILES:${PN}-utils += "${bindir}/glib-genmarshal \ @@ -130,6 +131,8 @@ do_install:append:class-target () { mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test fi fi + # https://gitlab.gnome.org/GNOME/glib/-/issues/2810 + rm -f ${D}${datadir}/installed-tests/glib/thread-pool-slow.test } # As we do not build python3 for windows, makes no sense to ship the script that's using it @@ -148,6 +151,7 @@ RDEPENDS:${PN}-ptest += "\ coreutils \ libgcc \ dbus \ + desktop-file-utils \ gnome-desktop-testing \ tzdata \ tzdata-americas \ diff --git a/poky/meta/recipes-core/glib-networking/glib-networking_2.72.2.bb b/poky/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index 746d1bc39c..dc0be23357 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking_2.72.2.bb +++ b/poky/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb @@ -7,9 +7,9 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0-native glib-2.0" -SRC_URI[archive.sha256sum] = "cd2a084c7bb91d78e849fb55d40e472f6d8f6862cddc9f12c39149359ba18268" +SRC_URI[archive.sha256sum] = "1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b" PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" diff --git a/poky/meta/recipes-core/glibc/glibc-locale.inc b/poky/meta/recipes-core/glibc/glibc-locale.inc index 7c14abfe99..7f70b3ca4f 100644 --- a/poky/meta/recipes-core/glibc/glibc-locale.inc +++ b/poky/meta/recipes-core/glibc/glibc-locale.inc @@ -5,14 +5,9 @@ SUMMARY = "Locale data from glibc" BPN = "glibc" LOCALEBASEPN = "${MLPREFIX}glibc" -# glibc-collateral.inc inhibits all default deps, but do_package needs objcopy -# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') -# ERROR: Function failed: split_and_strip_files -BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" -BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" -do_package[depends] += "${BINUTILSDEP}" - -DEPENDS += "virtual/libc" +# Do not inhibit default deps, do_package requires binutils/gcc for +# objcopy/gcc-nm and glibc-locale depends on virtual/libc directly. +INHIBIT_DEFAULT_DEPS = "" # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION # is set. The idea is to avoid running localedef on the target (at first boot) diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb index ec9f9f4fa3..ec9f9f4fa3 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.28.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.30.bb diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc index 39ba2636ff..2bdedcba6d 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" -SRCREV = "50cf2b6dd4fdf04309445f2eec8de7051d953abf" +SRCREV = "fee2687bad66e351a3dcc963a34ae80125923ff8" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb index 79dba2f6dc..79dba2f6dc 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.28.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.30.bb diff --git a/poky/meta/recipes-core/musl/libc-test/run-ptest b/poky/meta/recipes-core/musl/libc-test/run-ptest new file mode 100644 index 0000000000..0b4b687dec --- /dev/null +++ b/poky/meta/recipes-core/musl/libc-test/run-ptest @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +cd /opt/libc-test +make cleanall +make run || true + +echo "" +echo "--- ptest result ---" +# libc-test runs tests by module(e.g. src/api) and generates sub-module test +# report(e.g. src/api/REPORT) first. After all tests finish, it generates the +# consolidated report file src/REPORT. +report="/opt/libc-test/src/REPORT" +if ! [ -f "${report}" ]; then + echo "${report} not found!" + echo "FAIL: libc-test" + exit 1 +# libc-test prints error on failure and prints nothing on success. +elif grep -q '^FAIL src.*\.exe.*' "${report}"; then + # Print test failure in ptest format. + # e.g. "FAIL src/api/main.exe [status 1]" -> "FAIL: api_main" + grep '^FAIL src.*\.exe.*' "${report}" \ + | sed 's|^FAIL src/|FAIL: |;s|/|_|;s|\.exe.*\]||' + exit 1 +else + echo "PASS: libc-test" +fi diff --git a/poky/meta/recipes-core/musl/libc-test_git.bb b/poky/meta/recipes-core/musl/libc-test_git.bb new file mode 100644 index 0000000000..b5bfc6e34c --- /dev/null +++ b/poky/meta/recipes-core/musl/libc-test_git.bb @@ -0,0 +1,51 @@ +SUMMARY = "Musl libc unit tests" +HOMEPAGE = "https://wiki.musl-libc.org/libc-test.html" +DESCRIPTION = "libc-test is a collection of unit tests to measure the \ +correctness and robustness of a C/POSIX standard library implementation. It is \ +developed as part of the musl project." +SECTION = "tests" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=43ed1245085be90dc934288117d55a3b" + +inherit ptest + +SRCREV = "18e28496adee3d84fefdda6efcb9c5b8996a2398" +SRC_URI = " \ + git://repo.or.cz/libc-test;branch=master \ + file://run-ptest \ +" + +PV = "0+git${SRCPV}" + +S = "${WORKDIR}/git" + +# libc-test 'make' or 'make run' command is designed to build and run tests. It +# reports both build and test failures. The commands should be run on target. +do_compile() { + : +} + +RDEPENDS:${PN} = " \ + bash \ + grep \ + musl \ + packagegroup-core-buildessential \ +" + +RDEPENDS:${PN}-ptest = " \ + ${PN} \ + sed \ +" + +install_path = "/opt/${PN}" +FILES:${PN} += "${install_path}/*" + +do_install () { + install -d ${D}${install_path}/ + cp ${S}/Makefile ${D}${install_path} + cp ${S}/config.mak.def ${D}${install_path}/config.mak + cp -r ${S}/src ${D}${install_path} +} + +COMPATIBLE_HOST = "null" +COMPATIBLE_HOST:libc-musl = "(.*)" diff --git a/poky/meta/recipes-core/netbase/netbase_6.3.bb b/poky/meta/recipes-core/netbase/netbase_6.4.bb index bec6498cdd..5a448a4b91 100644 --- a/poky/meta/recipes-core/netbase/netbase_6.3.bb +++ b/poky/meta/recipes-core/netbase/netbase_6.4.bb @@ -3,14 +3,14 @@ DESCRIPTION = "This package provides the necessary infrastructure for basic TCP/ HOMEPAGE = "http://packages.debian.org/netbase" SECTION = "base" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=78dd2c7c6f487348e4a0092c17a19d42" PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" inherit allarch -SRC_URI[sha256sum] = "7c42a6a1cafa0c64103c71cab6431fc8613179b2449a1a00e55e3584e860d81c" +SRC_URI[sha256sum] = "fa6621826ff1150e581bd90bc3c8a4ecafe5df90404f207db6dcdf2c75f26ad7" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" @@ -21,3 +21,5 @@ do_install () { install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services install -m 0644 ${S}/etc/ethertypes ${D}${sysconfdir}/ethertypes } + +S = "${WORKDIR}/netbase" diff --git a/poky/meta/recipes-core/readline/readline.inc b/poky/meta/recipes-core/readline/readline.inc index 7f2f1a092b..4aefc5636d 100644 --- a/poky/meta/recipes-core/readline/readline.inc +++ b/poky/meta/recipes-core/readline/readline.inc @@ -18,7 +18,7 @@ SRC_URI += "file://inputrc" inherit autotools texinfo EXTRA_AUTORECONF += "--exclude=autoheader" -EXTRA_OECONF += "bash_cv_termcap_lib=ncurses" +EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library" LEAD_SONAME = "libreadline.so" diff --git a/poky/meta/recipes-core/readline/readline/configure-fix.patch b/poky/meta/recipes-core/readline/readline/configure-fix.patch deleted file mode 100644 index ef3104f8a6..0000000000 --- a/poky/meta/recipes-core/readline/readline/configure-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Pending - -Without this it fails to link against libtermcap causing various missing -symbols issues. - -RP - 8/10/08 - -Support 6.3 which uses configure.ac rather than configure.in. -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cea8f91..9075b8f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -218,10 +218,10 @@ if test -f ${srcdir}/support/shobj-conf; then - AC_MSG_CHECKING(configuration for building shared libraries) - eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` - --# case "$SHLIB_LIBS" in --# *curses*|*termcap*|*termlib*) ;; --# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; --# esac -+ case "$SHLIB_LIBS" in -+ *curses*|*termcap*|*termlib*) ;; -+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; -+ esac - - AC_SUBST(SHOBJ_CC) - AC_SUBST(SHOBJ_CFLAGS) --- -1.8.1.2 - diff --git a/poky/meta/recipes-core/readline/readline_8.1.2.bb b/poky/meta/recipes-core/readline/readline_8.1.2.bb deleted file mode 100644 index 787f7e734a..0000000000 --- a/poky/meta/recipes-core/readline/readline_8.1.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require readline.inc - -SRC_URI += "file://configure-fix.patch \ - file://norpath.patch \ - " - -SRC_URI[archive.sha256sum] = "7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6" diff --git a/poky/meta/recipes-core/readline/readline_8.2.bb b/poky/meta/recipes-core/readline/readline_8.2.bb new file mode 100644 index 0000000000..3a47297fe1 --- /dev/null +++ b/poky/meta/recipes-core/readline/readline_8.2.bb @@ -0,0 +1,5 @@ +require readline.inc + +SRC_URI += " file://norpath.patch" + +SRC_URI[archive.sha256sum] = "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" diff --git a/poky/meta/recipes-core/systemd/systemd-boot_251.4.bb b/poky/meta/recipes-core/systemd/systemd-boot_251.8.bb index b67706b731..b67706b731 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_251.4.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_251.8.bb diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index 71eb93f23a..3bb6b0efe6 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -14,7 +14,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "2a674b4b66af1a050a0362b646d2fca90c90112e" +SRCREV = "ae8b249af4acb055f920134f2ac584c4cbc86e3b" SRCBRANCH = "v251-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ " diff --git a/poky/meta/recipes-core/systemd/systemd_251.4.bb b/poky/meta/recipes-core/systemd/systemd_251.8.bb index 87668cadc7..5fb0e86982 100644 --- a/poky/meta/recipes-core/systemd/systemd_251.4.bb +++ b/poky/meta/recipes-core/systemd/systemd_251.8.bb @@ -395,11 +395,13 @@ SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfm SYSTEMD_SERVICE:${PN}-binfmt = "systemd-binfmt.service" USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ + udev \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ " GROUPADD_PARAM:${PN} = "-r systemd-journal;" +GROUPADD_PARAM:udev = "-r render" GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" @@ -437,9 +439,9 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ ${rootlibexecdir}/systemd/systemd-binfmt \ ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \ ${systemd_system_unitdir}/systemd-binfmt.service" -RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" +RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}" -RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" +RRECOMMENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ |