From patchwork Mon Nov 14 19:00:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15470 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1423C433FE for ; Mon, 14 Nov 2022 19:01:16 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web09.671.1668452475974576970 for ; Mon, 14 Nov 2022 11:01:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Re9B+1H+; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id t1so8145380wmi.4 for ; Mon, 14 Nov 2022 11:01:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RAGARMIJJyy73wTg+9vWJC3+O7d+w2W5RUV7JcyIEmw=; b=Re9B+1H+be5hYJ99e8b4S4Zv3iFwzFPculeSFa49D+edwf7x2L4FjDutNlAIhIvsKO Z3ezh0IellxbXz8qLwSozW0OqNg9Er8fvyag8lOroPAc659wONk8hTc7qhFenvktku8M blxxGr0cMfs6HdpFymZFVd7LmuBFsrL/3rJgbnpG4YEz5jHrMPUH5crDLoe1YZpInGLr jONd8B6l2QOFtSKCpGAlg3tXH6Tvm7jZSeoO3GjNAzhToBWpf45/0QyM5UlDj9N8cSTl cDseq5ssM0nV5SaOmAom54sRrRvtCYItXTVl60L8/+6c/ZFffFmTxXkSFO/OJBte7quX wfGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RAGARMIJJyy73wTg+9vWJC3+O7d+w2W5RUV7JcyIEmw=; b=GDFcD9IT9JSJsfcaSGCUUD99tp0lTo8QwwXFG6aF9GOf43vCAYX5AXnXNpbukLY9im 8Vy7G9YStJs1DYWYsxJK5zfXGCPnTnltLe7aaqsAzD7Q3pvOOMqYusPN//ssRXgGe/c3 W9lY8tWPkgRWVFECu3jOIBXDz1sso21MuxneaSnudWtq2C1Yg9haBrWTECcEXwDeAbfi 3af2+C3j3SfBTIFCwMAI2fQ2DXWPz8duS7qHwDeEZBaGmouS6qVW4ZYNGgJfsrrSS0Ds WmH8tC6gvP7IFZrUmk3O1gVeRq9WfqOy5yezfz3OzmWxbVlTNcaOv/UuDhms9Z+2Uffx mHxg== X-Gm-Message-State: ANoB5pl5rQVRaml5b6ckAeT2Br8FYZpzfB58Jo/HFB/bNVRo3ctR9Y4S RGTz22NHSK76gbqSyHZRNunKcBbt89I= X-Google-Smtp-Source: AA0mqf76fHd4/2ckNOhNplOq+KlXrcdtIhL9u9vJymHfSG3R+lKaCsyr0YeTNu7wltqzspKzHRl+9A== X-Received: by 2002:a05:600c:43d2:b0:3cf:92cc:9e5f with SMTP id f18-20020a05600c43d200b003cf92cc9e5fmr8948778wmn.181.1668452474003; Mon, 14 Nov 2022 11:01:14 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:13 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/8] gettext: update 0.21 -> 0.21.1 Date: Mon, 14 Nov 2022 20:00:49 +0100 Message-Id: <20221114190056.2612669-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173254 License-update: formatting Refresh gettext-minimal files from the 0.21.1 install tree. Signed-off-by: Alexander Kanavin --- ...t-env.in-do-not-add-C-CXX-parameters.patch | 0 ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 0 .../parallel.patch | 0 .../run-ptest | 0 .../serial-tests-config.patch | 0 .../use-pkgconfig.patch | 226 +++++++++--------- ...-builds-with-automake-1.16.4-and-new.patch | 29 --- ...rge-29-Add-executable-file-mode-bits.patch | 23 -- .../gettext/gettext-0.21/mingw.patch | 28 --- .../COPYING | 0 .../Makefile.in.in | 0 .../aclocal/gettext.m4 | 28 +-- .../aclocal/host-cpu-c-abi.m4 | 11 +- .../aclocal/iconv.m4 | 67 +++--- .../aclocal/intlmacosx.m4 | 2 +- .../aclocal/lib-ld.m4 | 6 +- .../aclocal/lib-link.m4 | 23 +- .../aclocal/lib-prefix.m4 | 17 +- .../aclocal/nls.m4 | 2 +- .../aclocal/po.m4 | 12 +- .../aclocal/progtest.m4 | 12 +- .../config.rpath | 6 +- .../remove-potcdate.sin | 0 ...21.bb => gettext-minimal-native_0.21.1.bb} | 0 .../{gettext_0.21.bb => gettext_0.21.1.bb} | 9 +- 25 files changed, 223 insertions(+), 278 deletions(-) rename meta/recipes-core/gettext/{gettext-0.21 => gettext-0.21.1}/0001-init-env.in-do-not-add-C-CXX-parameters.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21 => gettext-0.21.1}/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21 => gettext-0.21.1}/parallel.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21 => gettext-0.21.1}/run-ptest (100%) rename meta/recipes-core/gettext/{gettext-0.21 => gettext-0.21.1}/serial-tests-config.patch (100%) rename meta/recipes-core/gettext/{gettext-0.21 => gettext-0.21.1}/use-pkgconfig.patch (81%) delete mode 100644 meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch delete mode 100644 meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch delete mode 100644 meta/recipes-core/gettext/gettext-0.21/mingw.patch rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/COPYING (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/Makefile.in.in (100%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/gettext.m4 (94%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/host-cpu-c-abi.m4 (98%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/iconv.m4 (86%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/intlmacosx.m4 (98%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/lib-ld.m4 (97%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/lib-link.m4 (96%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/lib-prefix.m4 (95%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/nls.m4 (99%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/po.m4 (98%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/aclocal/progtest.m4 (90%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/config.rpath (99%) rename meta/recipes-core/gettext/{gettext-minimal-0.21 => gettext-minimal-0.21.1}/remove-potcdate.sin (100%) rename meta/recipes-core/gettext/{gettext-minimal-native_0.21.bb => gettext-minimal-native_0.21.1.bb} (100%) rename meta/recipes-core/gettext/{gettext_0.21.bb => gettext_0.21.1.bb} (95%) diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch rename to meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch rename to meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch diff --git a/meta/recipes-core/gettext/gettext-0.21/parallel.patch b/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21/parallel.patch rename to meta/recipes-core/gettext/gettext-0.21.1/parallel.patch diff --git a/meta/recipes-core/gettext/gettext-0.21/run-ptest b/meta/recipes-core/gettext/gettext-0.21.1/run-ptest similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21/run-ptest rename to meta/recipes-core/gettext/gettext-0.21.1/run-ptest diff --git a/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch similarity index 100% rename from meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch rename to meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch diff --git a/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch similarity index 81% rename from meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch rename to meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch index fc77feb270..c12e0d3b88 100644 --- a/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch +++ b/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 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 --- - 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 -- #include -- #include -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +- #include +- #include +- ]], +- [[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 -- #include -- #include -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +- #include +- #include +- ]], +- [[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 which is - dnl self-contained. - libxml2_include_dir= -- AC_TRY_CPP([#include ], +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])], - [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 ], +- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include ]])], - [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 -- #include -- #include -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +- #include +- #include +- ]], +- [[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 ], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[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 ], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[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 ], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[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 --#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 +- #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 --#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 +- #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 --#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 +- #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 ], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[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 ], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[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 ], -- [const char *version = LIBCROCO_VERSION; return !version;], +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[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 --#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 +- #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 --#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 +- #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 --#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 +- #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/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch b/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/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 -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 ---- - 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 . - 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/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch b/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch deleted file mode 100644 index e42a6c0a4d..0000000000 --- a/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 -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 ---- - 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/meta/recipes-core/gettext/gettext-0.21/mingw.patch b/meta/recipes-core/gettext/gettext-0.21/mingw.patch deleted file mode 100644 index b062c784f6..0000000000 --- a/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 -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 ---- - 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/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.21/COPYING rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.21.1/Makefile.in.in similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/Makefile.in.in diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/gettext.m4 similarity index 94% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/gettext.m4 index 4f25a27d93..f4492405bd 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/host-cpu-c-abi.m4 similarity index 98% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/host-cpu-c-abi.m4 index 6db2aa25ae..b9223241b4 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/iconv.m4 similarity index 86% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/iconv.m4 index e593b7270a..00057953e3 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 +++ b/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 . +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 + */ { 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 #include 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 . 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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/intlmacosx.m4 similarity index 98% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/intlmacosx.m4 index ebd9937c1a..ecc88d6e74 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-ld.m4 similarity index 97% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-ld.m4 index 98c348faff..934207a765 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-link.m4 similarity index 96% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-link.m4 index eecf70ec76..3b75bcd0de 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 +++ b/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 . + 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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-prefix.m4 similarity index 95% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/lib-prefix.m4 index c8a0b464c2..999f712f5a 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/nls.m4 similarity index 99% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/nls.m4 index 5a506fc4b5..7c11c90f52 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/po.m4 similarity index 98% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/po.m4 index 3778fd7aac..2f14f8e2b1 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 +++ b/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/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/progtest.m4 similarity index 90% rename from meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/aclocal/progtest.m4 index f28010aed1..4a5b0b4c6d 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 +++ b/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 , 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/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.21.1/config.rpath similarity index 99% rename from meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/config.rpath index 24be79cfb6..1e1ab67906 100755 --- a/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath +++ b/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 , 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/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.21.1/remove-potcdate.sin similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin rename to meta/recipes-core/gettext/gettext-minimal-0.21.1/remove-potcdate.sin diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb similarity index 100% rename from meta/recipes-core/gettext/gettext-minimal-native_0.21.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb diff --git a/meta/recipes-core/gettext/gettext_0.21.bb b/meta/recipes-core/gettext/gettext_0.21.1.bb similarity index 95% rename from meta/recipes-core/gettext/gettext_0.21.bb rename to meta/recipes-core/gettext/gettext_0.21.1.bb index 364e6a52a1..ec80a89e49 100644 --- a/meta/recipes-core/gettext/gettext_0.21.bb +++ b/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 From patchwork Mon Nov 14 19:00:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD73AC43219 for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web11.738.1668452476635806052 for ; Mon, 14 Nov 2022 11:01:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MZxjM3Q1; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id h9so20038523wrt.0 for ; Mon, 14 Nov 2022 11:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xbFPWM8HvcFazviPEH6DR11R6gXvVLeIf7z3FXuYBDg=; b=MZxjM3Q1CfSqmYP+N3dmvinHa4iXDXkznfp0bw2D9iDXxFfnXcLE3AQGAv5UgRSTJP 1GpUe2NLae5REQNZm00tz/mNY1okEaok634tdkNv/ZaK8iAysj9k4i6fFmA2ROzvP4Ww gZh9sk1j9UNEvKWCpCDhAKqi5yv/J+kdyZHW7SMGzxs5NOeKHSYGd5GAgh/ew//Rkwh9 gfJyScgxRLp247NTMwnHjVXwTj+p902NH2QEck6kvJPyjqxFuZDJgWBRKdazu6uXRBcM Er9zX+IpQXyxFAP1qxtWL5T0nY+gRufNqIgiLt2pQD/DegYrvTqxjz4aQtN/MWnbFlAI m2vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xbFPWM8HvcFazviPEH6DR11R6gXvVLeIf7z3FXuYBDg=; b=psnjoD62KUvca+zo5unUS+Bhifc6/NTA6u5M+RJGAR57Y1uhJgOdIENurmlcQ973+7 uv9IKxOPS4l/2wchQtRo0pJLWYIUTgnejHsBiNlxi7cCJm1cpDmiP2KUT6M6lYvaKibJ UAvLYwKcl55kHYAIhnH94ayuEUZulM8o4awmwaKjDU/Gt01ChQBW2/8Y/HIHg27D83ID LDQ5oU3oTrtNavKF6c4Piyn6y1Lyx/noTMbe5KmpnNmXl8fTg+y8zHdnHAtQYf7n8tPT +kHWFvn50s7JG/bEzMsew6UM3deHDQ/KPbVSAyDhEbFpbZEgKyls+WNDAHg7Wmhqx6T5 WfUg== X-Gm-Message-State: ANoB5pnLIS3TkjPZSqa1sC4TsOjXP+IfPIfr7wkCs3H6v64n8qT2DgQk trh1DMIIrThPtMS1xfp3GC61tuIXm5E= X-Google-Smtp-Source: AA0mqf5er+V2g8hEv0LKZqU5/UBJm+AG2wgnx0d50AUZkQlDkSLXqahPxLvRNN7ZWmwes3RJsoguAw== X-Received: by 2002:a05:6000:1f98:b0:236:a920:73e8 with SMTP id bw24-20020a0560001f9800b00236a92073e8mr8706251wrb.5.1668452474695; Mon, 14 Nov 2022 11:01:14 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:14 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/8] glib-2.0: update 2.72.3 -> 2.74.1 Date: Mon, 14 Nov 2022 20:00:50 +0100 Message-Id: <20221114190056.2612669-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173255 Patches: 0001-Do-not-ignore-return-value-of-write.patch merged upstream Enable-more-tests-while-cross-compiling.patch replaced with a request to upstream to solve this correctly with meson's exe_wrapper: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3067 https://github.com/mesonbuild/meson/issues/11029 License-update: formatting Make needed adjustments to ptests. Backport a couple of patches to address musl failures. Signed-off-by: Alexander Kanavin --- ...-Do-not-ignore-return-value-of-write.patch | 39 ------ ...t-write-bindir-into-pkg-config-files.patch | 14 +- ...-correctly-when-building-with-mingw3.patch | 46 +++---- ...-info-don-t-assume-million-in-one-ev.patch | 23 ++-- ...build-do-not-use-can_run_host_binari.patch | 48 +++++++ ...ble-more-tests-while-cross-compiling.patch | 123 ------------------ .../glib-2.0/glib-2.0/cpp-null.patch | 77 +++++++++++ .../glib-2.0/glib-2.0/cpp-null2.patch | 31 +++++ .../glib-2.0/glib-2.0/relocate-modules.patch | 8 +- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 1 + ...{glib-2.0_2.72.3.bb => glib-2.0_2.74.1.bb} | 7 +- meta/recipes-core/glib-2.0/glib.inc | 16 ++- 12 files changed, 208 insertions(+), 225 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.72.3.bb => glib-2.0_2.74.1.bb} (90%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/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/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 -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 - ---- - 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/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 5fe3aa898e..9bdd99d8a2 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/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 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 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/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 59de3fa969..2e1e2313e8 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/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 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 + --- 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 -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/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch b/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/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-g-file-info-don-t-assume-million-in-one-ev.patch +++ b/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 - -From 14838522a706ebdcc3cdab661d4c368099fe3a4e Mon Sep 17 00:00:00 2001 +From 3c56ff21b9a5fe18f9cec9b97ae1788fdf5d563e Mon Sep 17 00:00:00 2001 From: Ross Burton 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 + 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/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch b/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/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 +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 + +--- + 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/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch deleted file mode 100644 index f5c161fe04..0000000000 --- a/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 -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 - ---- - 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/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch b/meta/recipes-core/glib-2.0/glib-2.0/cpp-null.patch new file mode 100644 index 0000000000..63cbf90ab2 --- /dev/null +++ b/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?= +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 +--- + 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/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch b/meta/recipes-core/glib-2.0/glib-2.0/cpp-null2.patch new file mode 100644 index 0000000000..763d5ce539 --- /dev/null +++ b/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?= +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 +--- + 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(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/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index c0114397d8..7723ac6672 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/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 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 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 -@@ -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/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index 7a231b514b..c476d67310 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/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/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.74.1.bb similarity index 90% rename from meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.74.1.bb index b5ab6502a3..8fd785a7fd 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb +++ b/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/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index ffddefe22e..843b6bd29b 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/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 \ From patchwork Mon Nov 14 19:00:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6AB2C4167E for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web08.755.1668452476914074796 for ; Mon, 14 Nov 2022 11:01:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XuvtuF3A; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so8617122wmi.3 for ; Mon, 14 Nov 2022 11:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aMXEms9tNm8B7Ja5vY+dYwfSQWv22vj6as0oF5KhWOo=; b=XuvtuF3AdvTB5w38YEalvi1PTTXniu4StmctxsJhPy5h0qCbH8gzAKdJWPcQY1J2pO 7pu386NmS83BAEP8xSAfCthFOB2Jl7y/I30UdJJz+P2fhF67Ooeb3CIPA5SLkkvQ+8By skc0kZO5pWeG3B1Bo8UDqIal3ALRMFU92gEV7RpN7DmqNmA1xLSU8gJ0X9L8ekFOgo5f ranCLELekae+cGIlMYo80XrZDDVO3Fa5BXKlhzV3GFzBP7ls9jurVWEoKtJElKjzYFBl orYEdYhJQoIbqbRlYkeYCTr2BOrKKOYC6nuiydIgmYc778zOg6zt4vZjfJLFibVBBPU6 4cxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aMXEms9tNm8B7Ja5vY+dYwfSQWv22vj6as0oF5KhWOo=; b=3Pq9ORXI7R+QRSUjGX5mpG+FLYhRM39/GaBSo5CPp2UpQ54MV2kCePn0pU8bX3F/mx VlI8yZiIBei+vfmNRN8nkoy6eLII5s41c+9t6yLxq8yoIBD/7Iz2a+n2Sgobv67d72GV MCSsA/RSI4C2Mzf+ciIc77c4P4s1TW5eKeGZmnjQw8gvHNYYpsyT5iVN0gAXNS2Srh7o QvqycyXZ5jyc+WMnnuInlnpYAvzAReJchhiQdES/JomL6GHL8mWzLfpAmmT2MN1QojH5 yM12+73jJvKtF5K3586r737nVfljMK0LcmwOSGjRewdUKbPcTZSlBBlWafvYxKmoGHDB H3rA== X-Gm-Message-State: ANoB5pmcgZFzk5tV4K2cQvNkMD517Zx4kjOrauzhfcA0oTjkPm1HdUon /y68Nr3BpQaePJSye6xGTJtK+J7a07M= X-Google-Smtp-Source: AA0mqf5XAraEone41HlyU5zhInxk4uRZ8FXYtAdvocSxJvD/2YUZmoLNbzQSPr5IVh+EcbTIgTh2Rg== X-Received: by 2002:a05:600c:4e54:b0:3cf:7981:9a7 with SMTP id e20-20020a05600c4e5400b003cf798109a7mr8969363wmq.87.1668452475383; Mon, 14 Nov 2022 11:01:15 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:15 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/8] glib-networking: update 2.72.2 -> 2.74.0 Date: Mon, 14 Nov 2022 20:00:51 +0100 Message-Id: <20221114190056.2612669-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173256 glib-2.0-native is needed for gio-querymodules executable Signed-off-by: Alexander Kanavin --- .../{glib-networking_2.72.2.bb => glib-networking_2.74.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/glib-networking/{glib-networking_2.72.2.bb => glib-networking_2.74.0.bb} (91%) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.72.2.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb similarity index 91% rename from meta/recipes-core/glib-networking/glib-networking_2.72.2.bb rename to meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index 746d1bc39c..dc0be23357 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.72.2.bb +++ b/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)}" From patchwork Mon Nov 14 19:00:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15472 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC988C43217 for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web08.756.1668452477705667751 for ; Mon, 14 Nov 2022 11:01:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HCbbgb7D; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5so8151531wmo.1 for ; Mon, 14 Nov 2022 11:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xvb9UTQZNYjJLmiodshYO9I4tUlJAFFVAplMK4KsC/Y=; b=HCbbgb7DuogAKAl3wG02sPY0FpNW7eA7hIjCQlg/Ay7sfcIdm9V5lRvaIWwtTtz7AG bBgC6Lei7wCiqO2HlFG/0toc28qQdeq7JQzVt0XxkWQeZhNCVnDSfSYcRJ8D9mwGknb4 W85hn+qn3fL5G3oKN0e+9KdXQJqkHX/7kAqfWjaxaMaFWp2hSpnxvJ6zy2AXM4HvAqoW WbZQ9d+PkjsxpWG4QuciH0oT714xuhzfCQ2l+PQOVkUMXZJuoVkmcRgum81WF2mhQzLq jyqCvN92dKzAPxFsFejmwBpoogqM6iFdFljeI4Po04q8uCiIALNsij052UaCb9kGW6pA IyxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xvb9UTQZNYjJLmiodshYO9I4tUlJAFFVAplMK4KsC/Y=; b=BCzjWK4YxjY4yA5l3G1HuOcFUwS1ekfCsrmzty2gir7cnXJqgeDRYojasuXkv+rRRH Pbv9v3T12WOGBv0s/lO/iWL1OjObbSboZHnLhwRmg1KW9jmXu1OCiTcxKoVZ/waN/wcv HTwKa5BvMw1tcyBCWawEivSbZW3O70a4qSq+CkyMrLYK2/JRk90KDsPE168xWPygKu0y JNW5Mjxi2mp68PW9vngTtUABFhgKe/p3FJ4kf35MIJjIdhNd6HK+cQenCWRrUy6aZWTX +62l4pk61XMTWz/O+PBh3Svdh/vuNsq7VLgpTsoWoeMKo2PViLXLAfLKD8SYaC8CIs9U GGAw== X-Gm-Message-State: ANoB5pkziYkKypacLv/qWTuO/xOuermnvPO8vP4HsUtrYPR1pswn5g1w rzL7lKDcBWFJXlW1Yowh+jNkyMF/AuE= X-Google-Smtp-Source: AA0mqf4nj64j7jqeTgK+p6HSRVb0yPQtfIIBTp20K34pBrP6PDi07rrgCRZKRA//jmhhYXDSZoG22A== X-Received: by 2002:a05:600c:ac9:b0:3cf:cab4:a42b with SMTP id c9-20020a05600c0ac900b003cfcab4a42bmr9047914wmr.36.1668452476027; Mon, 14 Nov 2022 11:01:16 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:15 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/8] readline: update 8.1.2 -> 8.2 Date: Mon, 14 Nov 2022 20:00:52 +0100 Message-Id: <20221114190056.2612669-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173257 Replace configure-fix.patch with --with-shared-termcap-library Backport a compatibility fix for gdb. Signed-off-by: Alexander Kanavin --- meta/recipes-core/readline/readline.inc | 2 +- .../readline/readline/configure-fix.patch | 35 ----------------- meta/recipes-core/readline/readline_8.1.2.bb | 7 ---- meta/recipes-core/readline/readline_8.2.bb | 5 +++ meta/recipes-devtools/gdb/gdb.inc | 1 + .../gdb/gdb/readline-8.2.patch | 39 +++++++++++++++++++ 6 files changed, 46 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-core/readline/readline/configure-fix.patch delete mode 100644 meta/recipes-core/readline/readline_8.1.2.bb create mode 100644 meta/recipes-core/readline/readline_8.2.bb create mode 100644 meta/recipes-devtools/gdb/gdb/readline-8.2.patch diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 7f2f1a092b..4aefc5636d 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/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/meta/recipes-core/readline/readline/configure-fix.patch b/meta/recipes-core/readline/readline/configure-fix.patch deleted file mode 100644 index ef3104f8a6..0000000000 --- a/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 ---- - 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/meta/recipes-core/readline/readline_8.1.2.bb b/meta/recipes-core/readline/readline_8.1.2.bb deleted file mode 100644 index 787f7e734a..0000000000 --- a/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/meta/recipes-core/readline/readline_8.2.bb b/meta/recipes-core/readline/readline_8.2.bb new file mode 100644 index 0000000000..3a47297fe1 --- /dev/null +++ b/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/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 3b569fd40e..5a9fe271b9 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -14,5 +14,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0007-resolve-restrict-keyword-conflict.patch \ file://0008-Fix-invalid-sigprocmask-call.patch \ file://0009-gdbserver-ctrl-c-handling.patch \ + file://readline-8.2.patch \ " SRC_URI[sha256sum] = "0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed" diff --git a/meta/recipes-devtools/gdb/gdb/readline-8.2.patch b/meta/recipes-devtools/gdb/gdb/readline-8.2.patch new file mode 100644 index 0000000000..c2db4c0d79 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/readline-8.2.patch @@ -0,0 +1,39 @@ +From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Sun, 20 Mar 2022 14:01:54 +0100 +Subject: [PATCH] Add support for readline 8.2 + +In readline 8.2 the type of rl_completer_word_break_characters changed to +include const. + +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b567a7dee39d99f37b37802034c3fce9c4] +Signed-off-by: Alexander Kanavin +--- + gdb/completer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/completer.c b/gdb/completer.c +index d3900ae2014..a51c16ac7f8 100644 +--- a/gdb/completer.c ++++ b/gdb/completer.c +@@ -36,7 +36,7 @@ + calling a hook instead so we eliminate the CLI dependency. */ + #include "gdbcmd.h" + +-/* Needed for rl_completer_word_break_characters() and for ++/* Needed for rl_completer_word_break_characters and for + rl_filename_completion_function. */ + #include "readline/readline.h" + +@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *) rl_completer_word_break_characters; + } + + char * +-- +2.31.1 + From patchwork Mon Nov 14 19:00:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15474 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D952DC4321E for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web12.746.1668452478176462713 for ; Mon, 14 Nov 2022 11:01:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SLg2/Fa/; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso8620884wmo.1 for ; Mon, 14 Nov 2022 11:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d/zU+0UAzMrb+9kBECftICMCrBYrk4fRO0EFysmnD2E=; b=SLg2/Fa/nLVZcKjBux5rlme7zkjZD2GNdzL8FOaMQpdt+zm5nfmV/NjXZrN2FXyK0h +w5yVrAunjibSfzlVS2tiMN7g1mX7IomM2YLoIZxYGFoIG5efO45hW0kLgUL3a1Vq/q6 LFK4unk0rQyiSz/3nd0pWTSrXCZBneueVRbhPWjmphC34cqgxh1fLMvjlfzaBjDIvt88 br2kfAunTxFN+mgawVu4iVoxoqSfsGCj81/9CwfYN3QHoSkItJJiVlBs1GBd7N9yis5O aiIQGAartOMiiMhy4SHiEVxXvYD6ePFKJWcLEjQ5SiCJEO4srWcICqwwG2D/yTBFTkWg bDnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d/zU+0UAzMrb+9kBECftICMCrBYrk4fRO0EFysmnD2E=; b=VrmwR/3GbjflUm4sEkEesIak92A2tpY+H802tkJZ8pb6i/Y5R0ctgzEN6/o+pszMvw 2239W/Q2PzruLTt8moHDrzvlEQzdETQs9ZgvTb/5QzewIPZAdiqz/9OuUs7xpmM4Nu2M jYYHpR1SpPENQBvGw8aFesiVFQ3YPHafj5DnTBkF6ewLrW3WXoiFugPL2bm0ltNZDH3b gMzhf/6Jv3wz7Nu1/35/odCjnQzGO2gKIMGkk9GsGXZyUSTTIuUb4cuRBExtKzyaJvlf 7fiYAnbCZCGurAczKLyyBBvry/EQNe2+49dMd8XmLo2TjiaEdyQP54hqLW+6tN+M0YE8 TCVw== X-Gm-Message-State: ANoB5pngP/c7M30BE0o0TGpNUDqiMsQMVEsgBuUSgp4ScXP17CWqmGct kyk9e3yGwRN6e7HkqHbBNHx7qjr96XM= X-Google-Smtp-Source: AA0mqf4HLjZ/N6Z5gxxkkp5B3KlAuQS4IRgooRydWfH6xCyzn1rYAE7sPrIX2Rx1iQj3N2JTDimunw== X-Received: by 2002:a1c:cc01:0:b0:3cf:a9c2:2b04 with SMTP id h1-20020a1ccc01000000b003cfa9c22b04mr9010681wmb.152.1668452476679; Mon, 14 Nov 2022 11:01:16 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:16 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/8] llvm: update 15.0.1 -> 15.0.4 Date: Mon, 14 Nov 2022 20:00:53 +0100 Message-Id: <20221114190056.2612669-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173258 zstd is a new compression option in addition to zlib. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 154a9a4ab0..4345701443 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -26,7 +26,7 @@ QEMUVERSION ?= "7.1%" GOVERSION ?= "1.19%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump -LLVMVERSION ?= "15.0.1" +LLVMVERSION ?= "15.0.4" RUSTVERSION ?= "1.65%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 1f47e5d0fb..2d346b70cf 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -8,7 +8,7 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" -DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" +DEPENDS = "libffi libxml2 zlib zstd libedit ninja-native llvm-native" COMPATIBLE_HOST:riscv64 = "null" COMPATIBLE_HOST:riscv32 = "null" @@ -19,14 +19,14 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -PV = "15.0.1" +PV = "15.0.4" MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" BRANCH = "release/${MAJOR_VERSION}.x" -SRCREV = "b73d2c8c720a8c8e6e73b11be4e27afa6cb75bdf" +SRCREV = "5c68a1cb123161b54b72ce90e7975d95a8eaf2a4" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ From patchwork Mon Nov 14 19:00:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15476 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9743C4167D for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web11.740.1668452479072026932 for ; Mon, 14 Nov 2022 11:01:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZPkMNYsz; spf=pass (domain: gmail.com, ip: 209.85.221.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f41.google.com with SMTP id v1so19972420wrt.11 for ; Mon, 14 Nov 2022 11:01:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1FG+HNImxPL5Y9kahYeBQzxL5qKvC5Ydb59eYSppkz8=; b=ZPkMNYsz7dlwdjzciF0gq1/DERd7uTb8QnWd/JkXAd28DnJqiOVzHQjFknoablY4Pj 6KfkdpK6sBwCy28kEueDFsI+VtfFw2cLiZ4aynFvzQ60BWZeAjRnY7DItd3wx+JQAp/w UYXlYqCxnmDmdnDV5xF2srKBspLL0h7yR44Mh+zqEShYSXtkPHadomULOgrj6WuQVns2 m253JDafxwnGuYEjCnJGG+4YluPgv2d/Dhb54hYoSkCYmfWVihm9nurGBltQrIcHlmj7 tLpPbzR3pZBcWZzGw6ExdmdTYRaT327QcystA0L05w88a8rP2B1ZGOPuNuUXErrhq8l5 IIfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1FG+HNImxPL5Y9kahYeBQzxL5qKvC5Ydb59eYSppkz8=; b=D+lzALE0u7XBNA18j/W9uzDxE2OPc5XDbB4Ow3dapDxmLqoqxJoLqZftsrPYZ3W2p7 kUOg9vcD17SofcYoeJpoZ230yjDkcEKABuLxVckhfe96OYlAojjUSS2ixki/C8K818U6 KWNt4df+ov5JfELpy/iDpjkuI89hmNCQQvHePBVH7RACXgivoj5SkDXtMNAmOaXPacik 9EqXJYjmH4GFwqIwIvFUe1/kIMSACH1VDhpK92ibBb5RRuB0cU9LJHcJ3iJLpkr0P+7I zFncb3kArPSft76TdNw0j5T882nuw+S0R+RnC8NssNuuLah2ZkKcPFpkT5xXHxkc6Vk8 dBiw== X-Gm-Message-State: ANoB5pnvbgvOEaXOL0H32M6N9ldeZPq1ntmJvgLKqCHhgWmFTG5pCp+C NmAAyf7+Dm/k/qkKDW6mdDyDWkYsxMo= X-Google-Smtp-Source: AA0mqf7Wf+2W+mhLbUpBbZw8Bjvoml1+CDdg0tLPqM+6zi/9GY4+plLg9D5usqCmxm3MKyCyAm0cJQ== X-Received: by 2002:a5d:4b90:0:b0:241:784b:666b with SMTP id b16-20020a5d4b90000000b00241784b666bmr6728847wrt.483.1668452477399; Mon, 14 Nov 2022 11:01:17 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:16 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/8] make: update 4.3 -> 4.4 Date: Mon, 14 Nov 2022 20:00:54 +0100 Message-Id: <20221114190056.2612669-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173259 Deleted patches: make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch (modified bit removed upstream) make/0001-src-dir.c-fix-buffer-overflow-warning.patch make/0002-w32-compat-dirent.c-follow-header.patch make/0003-posixfcn-fcntl-gnulib-make-emulated.patch (fixed upstream) make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch (code removed upstream) License-update: formatting Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/git/git_2.38.1.bb | 3 +- ...inst-Do-not-undef-POSIX-on-clang-arm.patch | 38 --------- ...rc-dir.c-fix-buffer-overflow-warning.patch | 41 ---------- ...low-being-detected-by-importing-proj.patch | 33 -------- ...02-w32-compat-dirent.c-follow-header.patch | 36 --------- ...-posixfcn-fcntl-gnulib-make-emulated.patch | 79 ------------------- meta/recipes-devtools/make/make/sigpipe.patch | 42 ++++++++++ meta/recipes-devtools/make/make_4.3.bb | 18 ----- meta/recipes-devtools/make/make_4.4.bb | 14 ++++ 9 files changed, 58 insertions(+), 246 deletions(-) delete mode 100644 meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch delete mode 100644 meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch delete mode 100644 meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch delete mode 100644 meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch delete mode 100644 meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch create mode 100644 meta/recipes-devtools/make/make/sigpipe.patch delete mode 100644 meta/recipes-devtools/make/make_4.3.bb create mode 100644 meta/recipes-devtools/make/make_4.4.bb diff --git a/meta/recipes-devtools/git/git_2.38.1.bb b/meta/recipes-devtools/git/git_2.38.1.bb index 033e36ae16..ef64dba7ac 100644 --- a/meta/recipes-devtools/git/git_2.38.1.bb +++ b/meta/recipes-devtools/git/git_2.38.1.bb @@ -71,7 +71,8 @@ do_install () { install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git if [ "${@bb.utils.filter('PACKAGECONFIG', 'manpages', d)}" ]; then - oe_runmake install-man DESTDIR="${D}" + # Needs to be serial with make 4.4 due to https://savannah.gnu.org/bugs/index.php?63362 + make install-man DESTDIR="${D}" fi } diff --git a/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch deleted file mode 100644 index 2da7c983dc..0000000000 --- a/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 86b7947156a0c33e768d0a265e38f2881a70a7e2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 6 Mar 2020 23:19:37 -0800 -Subject: [PATCH] makeinst: Do not undef POSIX on clang/arm - -if __arm internal compiler macro is defined then make assumes that the -system is not posix and goes ahead and undefs POSIX, which results in -miscompiling make with clang, since clang does define __arm unlike gcc -which does not, but they both support posix just fine, so here check for -compiler not being clang when __arm is defined before undefining posix - -Fixes error like -../make-4.3/src/job.c:507:27: error: too many arguments to function call, expected 0, have 1 - sigsetmask (siggetmask (0) & ~fatal_signal_mask) - ~~~~~~~~~~ ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/makeint.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/makeint.h b/src/makeint.h -index c428a36..fadf963 100644 ---- a/src/makeint.h -+++ b/src/makeint.h -@@ -115,7 +115,7 @@ extern int errno; - #endif - - /* Some systems define _POSIX_VERSION but are not really POSIX.1. */ --#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) -+#if (defined (butterfly) || (defined (__arm) && !defined(__clang__)) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) - # undef POSIX - #endif - --- -2.25.1 - diff --git a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch b/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch deleted file mode 100644 index 57970824f6..0000000000 --- a/meta/recipes-devtools/make/make/0001-src-dir.c-fix-buffer-overflow-warning.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cd7091a7d88306004ca98c5dafcc40f44589b105 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 10:52:21 +0100 -Subject: [PATCH 1/3] src/dir.c: fix buffer-overflow warning - -Fix compiler warning: - src/dir.c:1294:7: warning: 'strncpy' specified bound depends on the - length of the source argument [-Wstringop-overflow=] - -The existing code assumes `path` will never exceed `MAXPATHLEN`. Also the -size of the buffer is increased by 1 to hold a path with the length of -`MAXPATHLEN` and trailing `0`. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/dir.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/dir.c b/src/dir.c -index 862a18e..cad4c4a 100644 ---- a/src/dir.c -+++ b/src/dir.c -@@ -1289,10 +1289,10 @@ local_stat (const char *path, struct stat *buf) - if (plen > 1 && path[plen - 1] == '.' - && (path[plen - 2] == '/' || path[plen - 2] == '\\')) - { -- char parent[MAXPATHLEN]; -+ char parent[MAXPATHLEN+1]; - -- strncpy (parent, path, plen - 2); -- parent[plen - 2] = '\0'; -+ strncpy (parent, path, MAXPATHLEN); -+ parent[MIN(plen - 2, MAXPATHLEN)] = '\0'; - if (stat (parent, buf) < 0 || !_S_ISDIR (buf->st_mode)) - return -1; - } --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch b/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch deleted file mode 100644 index b3d97f9a3a..0000000000 --- a/meta/recipes-devtools/make/make/0002-modules-fcntl-allow-being-detected-by-importing-proj.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fb8aaed3b040e589cd880fd714dda5ec00687217 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 12:10:06 +0100 -Subject: [PATCH 2/2] modules: fcntl: allow being detected by importing - projects - -GNU project `make` relies on gnulib but provides some own compatibility -functions - including an `fcntl`, which fails on mingw. -The intension of gnulib is providing these functions and being wider tested, -but silently injecting a function opens battle of compatibility layers. - -So adding a hint into target `config.h` to allow deciding whether using -an own compatibility implementation or not. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending - - m4/gnulib-comp.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 3ee0811..cf75541 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -147,6 +147,7 @@ - gl_FUNC_FCNTL - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - AC_LIBOBJ([fcntl]) -+ AC_DEFINE(HAVE_GNULIB_FCNTL, 1, [Define to 1 if you have the `fcntl' function via gnulib.]) - fi - gl_FCNTL_MODULE_INDICATOR([fcntl]) - gl_FCNTL_H diff --git a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch b/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch deleted file mode 100644 index 9ecc44543e..0000000000 --- a/meta/recipes-devtools/make/make/0002-w32-compat-dirent.c-follow-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4dd8b4f43aa0078707ad9a7932f4e137bc4383ed Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Mon, 24 Feb 2020 11:12:43 +0100 -Subject: [PATCH 2/3] w32: compat: dirent.c: follow header - -src/w32/include/dirent.h completely delegates to mingw dirent implementation, -gnulib detects it as fine and completely usable - trust in that. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/w32/compat/dirent.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/w32/compat/dirent.c b/src/w32/compat/dirent.c -index b8ec615..de80f72 100644 ---- a/src/w32/compat/dirent.c -+++ b/src/w32/compat/dirent.c -@@ -23,7 +23,7 @@ this program. If not, see . */ - #include - #include "dirent.h" - -- -+#ifndef __MINGW32__ - DIR* - opendir(const char* pDirName) - { -@@ -193,3 +193,4 @@ seekdir(DIR* pDir, long nPosition) - - return; - } -+#endif /* !__MINGW32__ */ --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch b/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch deleted file mode 100644 index 70414c51f4..0000000000 --- a/meta/recipes-devtools/make/make/0003-posixfcn-fcntl-gnulib-make-emulated.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3d074c8fca5fcf3e6b83d33788f35a8f1b3a44a2 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack -Date: Fri, 21 Feb 2020 19:29:49 +0100 -Subject: [PATCH 3/3] posixfcn: fcntl: gnulib > make-emulated - -Rate the fcntl emulation from gnulib higher than the own one. - -Signed-off-by: Jens Rehsack ---- -Upstream-Status: Pending (https://savannah.gnu.org/bugs/?57888) - - src/output.h | 19 ++++++++++++++----- - src/w32/compat/posixfcn.c | 2 ++ - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/src/output.h b/src/output.h -index a506505..d3ce6b7 100644 ---- a/src/output.h -+++ b/src/output.h -@@ -67,14 +67,21 @@ void output_dump (struct output *out); - - # ifdef WINDOWS32 - /* For emulations in w32/compat/posixfcn.c. */ --# define F_GETFD 1 --# define F_SETLKW 2 -+# ifndef F_GETFD -+# define F_GETFD 1 -+# endif -+# ifndef F_SETLKW -+# define F_SETLKW 2 -+# endif - /* Implementation note: None of the values of l_type below can be zero - -- they are compared with a static instance of the struct, so zero - means unknown/invalid, see w32/compat/posixfcn.c. */ --# define F_WRLCK 1 --# define F_UNLCK 2 -- -+# ifndef F_WRLCK -+# define F_WRLCK 1 -+# endif -+# ifndef F_UNLCK -+# define F_UNLCK 2 -+# endif - struct flock - { - short l_type; -@@ -89,7 +96,9 @@ struct flock - typedef intptr_t sync_handle_t; - - /* Public functions emulated/provided in posixfcn.c. */ -+# ifndef HAVE_GNULIB_FCNTL - int fcntl (intptr_t fd, int cmd, ...); -+# endif - intptr_t create_mutex (void); - int same_stream (FILE *f1, FILE *f2); - -diff --git a/src/w32/compat/posixfcn.c b/src/w32/compat/posixfcn.c -index 975dfb7..d337b9c 100644 ---- a/src/w32/compat/posixfcn.c -+++ b/src/w32/compat/posixfcn.c -@@ -29,6 +29,7 @@ this program. If not, see . */ - #ifndef NO_OUTPUT_SYNC - /* Support for OUTPUT_SYNC and related functionality. */ - -+#ifndef HAVE_GNULIB_FCNTL - /* Emulation of fcntl that supports only F_GETFD and F_SETLKW. */ - int - fcntl (intptr_t fd, int cmd, ...) -@@ -142,6 +143,7 @@ fcntl (intptr_t fd, int cmd, ...) - return -1; - } - } -+#endif /* GNULIB_TEST_FCNTL */ - - static intptr_t mutex_handle = -1; - --- -2.17.1 - diff --git a/meta/recipes-devtools/make/make/sigpipe.patch b/meta/recipes-devtools/make/make/sigpipe.patch new file mode 100644 index 0000000000..a7270fdbda --- /dev/null +++ b/meta/recipes-devtools/make/make/sigpipe.patch @@ -0,0 +1,42 @@ +From 92ab2e642d2c04b3dcb5a736ae6193680bfd5f74 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sun, 6 Nov 2022 15:22:02 -0500 +Subject: * src/main.c (main): [SV 63307] Handle SIGPIPE as a fatal signal + +Always ignoring SIGPIPE is visible to child processes. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/make.git/commit/?id=92ab2e642d2c04b3dcb5a736ae6193680bfd5f74] +Signed-off-by: Alexander Kanavin +--- + src/main.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/main.c b/src/main.c +index eec9365..f2caf7a 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1182,11 +1182,6 @@ main (int argc, char **argv, char **envp) + /* Useful for attaching debuggers, etc. */ + SPIN ("main-entry"); + +- /* Don't die if our stdout sends us SIGPIPE. */ +-#ifdef SIGPIPE +- bsd_signal (SIGPIPE, SIG_IGN); +-#endif +- + #ifdef HAVE_ATEXIT + if (ANY_SET (check_io_state (), IO_STDOUT_OK)) + atexit (close_stdout); +@@ -1265,6 +1260,9 @@ main (int argc, char **argv, char **envp) + #ifdef SIGQUIT + FATAL_SIG (SIGQUIT); + #endif ++#ifdef SIGPIPE ++ FATAL_SIG (SIGPIPE); ++#endif + FATAL_SIG (SIGINT); + FATAL_SIG (SIGTERM); + +-- +cgit v1.1 + diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb deleted file mode 100644 index 9350bed05a..0000000000 --- a/meta/recipes-devtools/make/make_4.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -require make.inc - -SRC_URI += "\ - file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ - file://0002-modules-fcntl-allow-being-detected-by-importing-proj.patch \ - file://0001-src-dir.c-fix-buffer-overflow-warning.patch \ - file://0002-w32-compat-dirent.c-follow-header.patch \ - file://0003-posixfcn-fcntl-gnulib-make-emulated.patch \ - file://0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch \ -" - -EXTRA_OECONF += "--without-guile" - -SRC_URI[sha256sum] = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/make/make_4.4.bb b/meta/recipes-devtools/make/make_4.4.bb new file mode 100644 index 0000000000..6642c708d8 --- /dev/null +++ b/meta/recipes-devtools/make/make_4.4.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" +require make.inc + +SRC_URI += " \ + file://0001-m4-getloadavg.m4-restrict-AIX-specific-test-on-AIX.patch \ + file://sigpipe.patch \ + " + +EXTRA_OECONF += "--without-guile" + +SRC_URI[sha256sum] = "581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18" + +BBCLASSEXTEND = "native nativesdk" From patchwork Mon Nov 14 19:00:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC916C4332F for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web08.760.1668452479860716944 for ; Mon, 14 Nov 2022 11:01:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=l5sofJe6; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id t4so8140626wmj.5 for ; Mon, 14 Nov 2022 11:01:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oBRGrQgZu0sbADm/L6F1oYBolDbjuSJoHZaUxC9NFGY=; b=l5sofJe6ezQAzs4B20QY8nZmywXFH3PkxrjIObeKPRnzclmcf6MKrOiYrUH94ggrpN Da+E4umb2CEwc0zPdwk1jbY+54ACR52PArXceYVjnNNJlZcOHKWt1ZUEMbnSV7yRflm6 l9C8yWhiwdhVtQMVRp4Nukv43mO4Hog7wjqNZ60iu+0JXzSstflPrXNv76WYsgsNarS8 w0GFaCYI48sZgQK6XkURboK7wPz8vbSTKew9h2hlUXDANRke5tAEx/coVcdueP1GhVuC 5BybiecYR+eHoSmxw86g76D5GhliENssZzKKufEznowDJahWHvqDqx4gE3gQBmtqK7+y x0yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oBRGrQgZu0sbADm/L6F1oYBolDbjuSJoHZaUxC9NFGY=; b=49u8CwaYsCCz9wofdtBccFpqDUt/GQwk4xKTTafDU5VapfA2dAqwJFGWKIim6Qipti mw4ZJYAOyJuHIjK53PzAv1R6YVm/QYMGcWoZDAKQUddGfgr+XIhhUscK9v9TVZpJmU1F qUkuPG3Vdj+/hW6MO4F1rT+R87hFPa+y36oERV4l+zsHHv8FKkDl4c5zyci+Iqqxd/vz SHU61bERamwerzeLZC40Xra6gB89eRA9LpB9u0Zt2zje77jVhxnO7ciOqhZ1lOWUsMNo nOcduQwOkG+adl+7ThT4sbTXrNz4tPBJZL+tKrKuj+hxZKAMh07LooKFADFsV5HkxOeJ /wQg== X-Gm-Message-State: ANoB5pnV8zfwIwUfArxeWZ7Rtn5Nr+r9BNhWMvcgP9dsSx37L+m9kY+9 G9eFoLr8YqeW+Esn3lm+Ybi2td6fxXc= X-Google-Smtp-Source: AA0mqf7PhTPKsDLSFLmdK03os61qRLmrgzMd4b4IypOaSuRxlrR7wf7AywmcOE0YkWsFCkP8jfAGNg== X-Received: by 2002:a05:600c:3d94:b0:3cf:9b4d:ec4f with SMTP id bi20-20020a05600c3d9400b003cf9b4dec4fmr9191175wmb.114.1668452478031; Mon, 14 Nov 2022 11:01:18 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:17 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/8] bash: update 5.1.16 -> 5.2.9 Date: Mon, 14 Nov 2022 20:00:55 +0100 Message-Id: <20221114190056.2612669-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173260 Remove patches: execute_cmd.patch (purpose of patch unclear) makerace.patch/makerace2.patch (merged upstream) Signed-off-by: Alexander Kanavin --- .../bash/bash/execute_cmd.patch | 28 ------ .../recipes-extended/bash/bash/makerace.patch | 52 ---------- .../bash/bash/makerace2.patch | 98 ------------------- .../bash/bash/use_aclocal.patch | 27 +++-- .../bash/{bash_5.1.16.bb => bash_5.2.9.bb} | 5 +- 5 files changed, 20 insertions(+), 190 deletions(-) delete mode 100644 meta/recipes-extended/bash/bash/execute_cmd.patch delete mode 100644 meta/recipes-extended/bash/bash/makerace.patch delete mode 100644 meta/recipes-extended/bash/bash/makerace2.patch rename meta/recipes-extended/bash/{bash_5.1.16.bb => bash_5.2.9.bb} (79%) diff --git a/meta/recipes-extended/bash/bash/execute_cmd.patch b/meta/recipes-extended/bash/bash/execute_cmd.patch deleted file mode 100644 index 7a9e9a902f..0000000000 --- a/meta/recipes-extended/bash/bash/execute_cmd.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Rebase to 5.0 -Signed-off-by: Hongxu Jia ---- - execute_cmd.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/execute_cmd.c b/execute_cmd.c -index f1d74bf..31674b4 100644 ---- a/execute_cmd.c -+++ b/execute_cmd.c -@@ -2567,7 +2567,11 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close) - /* If the `lastpipe' option is set with shopt, and job control is not - enabled, execute the last element of non-async pipelines in the - current shell environment. */ -- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) -+ if (lastpipe_opt && -+#if defined(JOB_CONTROL) -+ job_control == 0 && -+#endif -+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) - { - lstdin = move_to_high_fd (0, 1, -1); - if (lstdin > 0) --- -2.7.4 - diff --git a/meta/recipes-extended/bash/bash/makerace.patch b/meta/recipes-extended/bash/bash/makerace.patch deleted file mode 100644 index 9bd7c280fe..0000000000 --- a/meta/recipes-extended/bash/bash/makerace.patch +++ /dev/null @@ -1,52 +0,0 @@ -We're seeing pipesize.h being created in parallel: - -/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h -/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h - -./mkbuiltins -D ../../bash-5.1/builtins ../../bash-5.1/builtins/ulimit.def -x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -c -DHAVE_CONFIG_H -DSHELL -I. -I.. -I../../bash-5.1 -I../../bash-5.1/include -I../../bash-5.1/lib -I../../bash-5.1/builtins -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= ulimit.c || ( rm -f ulimit.c ; exit 1 ) -make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' -rm -f redir.o -x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -DPROGRAM='"bash"' -DCONF_HOSTTYPE='"x86_64"' -DCONF_OSTYPE='"linux-gnu"' -DCONF_MACHTYPE='"x86_64-pokysdk-linux-gnu"' -DCONF_VENDOR='"pokysdk"' -DLOCALEDIR='"/opt/poky/3.2+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/locale"' -DPACKAGE='"bash"' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-5.1 -I../bash-5.1/include -I../bash-5.1/lib -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= -c ../bash-5.1/redir.c -In file included from ../../bash-5.1/builtins/../../bash-5.1/builtins/ulimit.def:95: -pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token - 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy - | ^ -make[1]: *** [Makefile:119: ulimit.o] Error 1 -make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' -make: *** [Makefile:737: builtins/libbuiltins.a] Error 1 -make: *** Waiting for unfinished jobs.... -In file included from ../bash-5.1/redir.c:61: -./builtins/pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token - 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy - | ^ -make: *** [Makefile:101: redir.o] Error 1 -WARNING: exit code 1 from a shell command. - -which happens since builtins/ulimit.o depends on pipesize.h as well as a top -level dependency. This means: - - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 - -races with: - - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} targets ) || exit 1 - -Hack around this by forcing BUILTINS_LIBRARY onto pipesize.h as a dependency. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-bash/2021-01/msg00152.html] -Signed-off-by: Richard Purdie - -Index: bash-5.1/Makefile.in -=================================================================== ---- bash-5.1.orig/Makefile.in -+++ bash-5.1/Makefile.in -@@ -746,7 +746,7 @@ ${DEFDIR}/bashgetopt.o: $(BUILTIN_SRCDIR - ${DEFDIR}/builtext.h: $(BUILTIN_DEFS) - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) builtext.h ) || exit 1 - --${DEFDIR}/pipesize.h: -+${DEFDIR}/pipesize.h: $(BUILTINS_LIBRARY) - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 - - $(SDIR)/man2html$(EXEEXT): ${SUPPORT_SRC}/man2html.c diff --git a/meta/recipes-extended/bash/bash/makerace2.patch b/meta/recipes-extended/bash/bash/makerace2.patch deleted file mode 100644 index abb51a5086..0000000000 --- a/meta/recipes-extended/bash/bash/makerace2.patch +++ /dev/null @@ -1,98 +0,0 @@ -The main makefile can call mkbuiltins from multiple different codepaths in parallel. -When called, it moves the existing files out the way and creates new ones, then -compares which will break the build if timing is unlucky. - -The root of the problem is mkbuiltins.c creating a file but also referencing that -file under the same name. By modifing it to allow the final name and the temp name -to be specified, we can avoid the original reason for the moving of files around. -This allows them to be created under a new name and then replaced if changed, -removing any race windows around accessing the files whilst they've been -moved or are being rewritten. - -See [YOCTO #14227] - -Upstream-Status: Submitted [https://savannah.gnu.org/patch/index.php?10210] -Signed-off-by: Richard Purdie - -Index: bash-5.1.8/builtins/Makefile.in -=================================================================== ---- bash-5.1.8.orig/builtins/Makefile.in -+++ bash-5.1.8/builtins/Makefile.in -@@ -185,19 +185,17 @@ gen-helpfiles: tmpbuiltins.o gen-helpfil - $(CC_FOR_BUILD) ${CCFLAGS_FOR_BUILD} $(LDFLAGS_FOR_BUILD) -o $@ gen-helpfiles.o tmpbuiltins.o $(LIBS_FOR_BUILD) - - builtext.h builtins.c: $(MKBUILTINS) $(DEFSRC) -- @-if test -f builtins.c; then mv -f builtins.c old-builtins.c; fi -- @-if test -f builtext.h; then mv -f builtext.h old-builtext.h; fi -- ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \ -+ ./$(MKBUILTINS) -externfile builtext-new.h -externfinalfile builtext.h -structfile builtins-new.c \ - -noproduction $(DIRECTDEFINE) $(HELPDIRDEFINE) $(HELPSTRINGS) $(DEFSRC) -- @-if cmp -s old-builtext.h builtext.h 2>/dev/null; then \ -- mv old-builtext.h builtext.h; \ -+ @-if ! cmp -s builtext.h builtext-new.h 2>/dev/null; then \ -+ mv builtext-new.h builtext.h; \ - else \ -- $(RM) old-builtext.h; \ -+ $(RM) builtext-new.h; \ - fi -- @-if cmp -s old-builtins.c builtins.c 2>/dev/null; then \ -- mv old-builtins.c builtins.c; \ -+ @-if ! cmp -s builtins.c builtins-new.c 2>/dev/null; then \ -+ mv builtins-new.c builtins.c; \ - else \ -- $(RM) old-builtins.c; \ -+ $(RM) builtins-new.c; \ - fi - - helpdoc: gen-helpfiles -Index: bash-5.1.8/builtins/mkbuiltins.c -=================================================================== ---- bash-5.1.8.orig/builtins/mkbuiltins.c -+++ bash-5.1.8/builtins/mkbuiltins.c -@@ -113,6 +113,9 @@ char *struct_filename = (char *)NULL; - /* The name of the external declaration file. */ - char *extern_filename = (char *)NULL; - -+/* The final name of the external declaration file. */ -+char *extern_final_filename = (char *)NULL; -+ - /* Here is a structure for manipulating arrays of data. */ - typedef struct { - int size; /* Number of slots allocated to array. */ -@@ -230,6 +233,8 @@ main (argc, argv) - - if (strcmp (arg, "-externfile") == 0) - extern_filename = argv[arg_index++]; -+ else if (strcmp (arg, "-externfinalfile") == 0) -+ extern_final_filename = argv[arg_index++]; - else if (strcmp (arg, "-structfile") == 0) - struct_filename = argv[arg_index++]; - else if (strcmp (arg, "-noproduction") == 0) -@@ -273,6 +278,9 @@ main (argc, argv) - } - } - -+ if (!extern_final_filename) -+ extern_final_filename = extern_filename; -+ - /* If there are no files to process, just quit now. */ - if (arg_index == argc) - exit (0); -@@ -1174,7 +1182,7 @@ write_file_headers (structfile, externfi - fprintf (structfile, "%s\n", structfile_header[i]); - - fprintf (structfile, "#include \"%s\"\n", -- extern_filename ? extern_filename : "builtext.h"); -+ extern_final_filename ? extern_final_filename : "builtext.h"); - - fprintf (structfile, "#include \"bashintl.h\"\n"); - -@@ -1184,7 +1192,7 @@ write_file_headers (structfile, externfi - if (externfile) - fprintf (externfile, - "/* %s - The list of builtins found in libbuiltins.a. */\n", -- extern_filename ? extern_filename : "builtext.h"); -+ extern_final_filename ? extern_final_filename : "builtext.h"); - } - - /* Write out any necessary closing information for diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch index bebaa08bfe..bd6870b386 100644 --- a/meta/recipes-extended/bash/bash/use_aclocal.patch +++ b/meta/recipes-extended/bash/bash/use_aclocal.patch @@ -1,3 +1,8 @@ +From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 28 Dec 2020 21:04:27 +0100 +Subject: [PATCH] bash: update 5.0 -> 5.1 + Including m4 files directly like this confuses autotools.bbclass, remove the references and rely upon aclocal to collect the m4 files together as needed instead making it work like other autotools based projects. @@ -5,17 +10,23 @@ as needed instead making it work like other autotools based projects. Upstream-Status: Inappropriate [OE configuration specific] RP 2021/1/20 -Index: bash-5.1/configure.ac -=================================================================== ---- bash-5.1.orig/configure.ac -+++ bash-5.1/configure.ac -@@ -688,47 +688,6 @@ if test x$SIZE = x; then +--- + configure.ac | 43 ------------------------------------------- + 1 file changed, 43 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 50a6e20..a3b5bd7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -710,49 +710,6 @@ if test x$SIZE = x; then fi AC_SUBST(SIZE) -m4_include([m4/stat-time.m4]) -m4_include([m4/timespec.m4]) - +-m4_include([m4/strtoimax.m4]) +- -dnl include files for gettext - -m4_include([m4/codeset.m4]) @@ -54,6 +65,6 @@ Index: bash-5.1/configure.ac -m4_include([m4/wint_t.m4]) -m4_include([m4/xsize.m4]) - - dnl Turn on any extensions available in the GNU C library. - AC_DEFINE(_GNU_SOURCE, 1) - + dnl C compiler characteristics + AC_C_CONST + AC_C_INLINE diff --git a/meta/recipes-extended/bash/bash_5.1.16.bb b/meta/recipes-extended/bash/bash_5.2.9.bb similarity index 79% rename from meta/recipes-extended/bash/bash_5.1.16.bb rename to meta/recipes-extended/bash/bash_5.2.9.bb index d046faa4e5..39a5d3de86 100644 --- a/meta/recipes-extended/bash/bash_5.1.16.bb +++ b/meta/recipes-extended/bash/bash_5.2.9.bb @@ -5,7 +5,6 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ file://test-output.patch \ @@ -13,11 +12,9 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-bash-ptests \ file://fix-run-builtins.patch \ file://use_aclocal.patch \ - file://makerace.patch \ - file://makerace2.patch \ " -SRC_URI[tarball.sha256sum] = "5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558" +SRC_URI[tarball.sha256sum] = "68d978264253bc933d692f1de195e2e5b463a3984dfb4e5504b076865f16b6dd" DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" From patchwork Mon Nov 14 19:00:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 15473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9630C4167B for ; Mon, 14 Nov 2022 19:01:26 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web08.761.1668452480177308669 for ; Mon, 14 Nov 2022 11:01:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=D7b9skXF; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id a11-20020a05600c2d4b00b003cf6f5fd9f1so8623360wmg.2 for ; Mon, 14 Nov 2022 11:01:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ljj5AjqegB/d1NwAyyyCZ71qlQlINFBvSlRplemsoq8=; b=D7b9skXFbxQnOdLhGfhFJt8KoR9n9t/xNpv9I4HOUiLLaf9f2sbh895yfvEXhvzIQZ ABoQGDPY0dPBUEAYr14LOLFLg4CqXoOxVP48tAYLdMAeo9w22dkU58HUDeuMRmHX2VCx PsDD6S8Fpu6MJI2t2ntmD0MdO648p9a5kCTw2FtFfDSrSU6rKAv9JoKHdiCwCxvS1uXC xsYFlbciYIzuGAoGgLjLjyrSDUhoq1DIc1GoFRYQmdHXdGVzFY5VcVDmMWX1Na0jXybk afZd4WUEabsqbcsOzPv/kezNcAIfAjxaYu/54A7Wzd22dd8r0zX4NeX02DFeKr/SRkKK oGag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ljj5AjqegB/d1NwAyyyCZ71qlQlINFBvSlRplemsoq8=; b=GA9d42QGCZa0sy3z4gHfyjs+luhcFRYHmbDLisH5yWA2OPxyQtkO8wREYz7Hdtwe3o 894H/UcG23kfY89LlSwxi4RN9MspmBd+D38MTpzMsv6r5SOw/QINHIQAlQ0e/9lpSkbP VLqvQKXVYrHRN6WWh+x3cDfUbaev7X/MgazbuK6ECOTm6CxQFD5cBSG8Zgx8QtB1Kih9 TQYmn4M14H7gP60hc77qsIGll1E9udq4w5hkb+dz2hUN26Jp1+c77GOzNQFcxRCXgL3o NvWWRJUicxdKAYhrWfU21TEGmOpdv1gnFKEBMw02UDtPdc61ePj6T3SXGKn8aYS2kcOC wtvw== X-Gm-Message-State: ANoB5pnawQlbyNmk1wT2Wohj9gwTn2v1OrdAvWf3xrtWLiZabFtGsOEg /RMN9ge+q9DSIEz/hY3leRdzLw8EehM= X-Google-Smtp-Source: AA0mqf5neAa1XmGQbYr/Dn5j7Jjb9j+HfZOju2+4C/PJF0FvdIFA+XnhJsBkKnDCS0Zdxzey2qH02w== X-Received: by 2002:a05:600c:358e:b0:3cf:8b53:747f with SMTP id p14-20020a05600c358e00b003cf8b53747fmr9302076wmq.192.1668452478677; Mon, 14 Nov 2022 11:01:18 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id c7-20020a1c3507000000b003c6f1732f65sm18091811wma.38.2022.11.14.11.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 11:01:18 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 8/8] mesa: do not rely on native llvm-config in target sysroot Date: Mon, 14 Nov 2022 20:00:56 +0100 Message-Id: <20221114190056.2612669-8-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114190056.2612669-1-alex@linutronix.de> References: <20221114190056.2612669-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Nov 2022 19:01:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/173261 Sadly the magic is not perfect: llvm-config contains a hardcoded value for the libdir from the native configuration, and things will break if the target build installs libraries somewhere else (e.g. lib64). llvm-config in target bindir also needs a rpath adjustment, otherwise it simply won't even run when e.g. building for arm on x86. To avoid patching llvm-source let's simply add more cases to the llvm-config wrapper script, so that falling through to llvm-config binary is avoided. Fortunately those cases are all static in what they return, even though llvm-config binary does poke around the file tree to arrive at them (which is where breakage happens if native and target don't match exactly wrt libdir). I verified that this works by building mesa with llvm enabled for qemuarm64 and with baselib set to 'lib64' - so that both the target architecture and target libdir differ from native ones. Upstream tickets: https://github.com/llvm/llvm-project/issues/58984 https://github.com/mesonbuild/meson/issues/11043 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/llvm/llvm/llvm-config | 9 +++++++++ meta/recipes-graphics/mesa/mesa.inc | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm/llvm-config b/meta/recipes-devtools/llvm/llvm/llvm-config index a45f38c650..5e4ded2da5 100644 --- a/meta/recipes-devtools/llvm/llvm/llvm-config +++ b/meta/recipes-devtools/llvm/llvm/llvm-config @@ -29,6 +29,15 @@ for arg in "$@"; do --ldflags) output="${output} ${LDFLAGS}" ;; + --shared-mode) + output="${output} shared" + ;; + --libs) + output="${output} -lLLVM" + ;; + --link-shared) + break + ;; *) remain="${remain} ${arg}" ;; diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 6246b723cf..1949fc15a9 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -55,17 +55,7 @@ ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" -# By placing llvm-config in the target sysroot bindir, it will then map values -# to the target libdir magically. We can safely add to path as there are no other binaries -# there. -PATH:prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR}:" MESA_LLVM_RELEASE ?= "${LLVMVERSION}" -do_configure:prepend () { - if [ -e ${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE} ]; then - cp ${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE} ${STAGING_BINDIR} - cp ${STAGING_BINDIR_NATIVE}/llvm-config ${STAGING_BINDIR} - fi -} # set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' # by default the upstream mesa sources build a debug release