@@ -605,7 +605,6 @@ RECIPE_MAINTAINER:pn-pigz = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER:pn-pinentry = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-pixman = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-pkgconf = "Ross Burton <ross.burton@arm.com>"
-RECIPE_MAINTAINER:pn-pkgconfig = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-pm-utils = "Ross Burton <ross.burton@arm.com>"
RECIPE_MAINTAINER:pn-pointercal-xinput = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-pong-clock = "Unassigned <unassigned@yoctoproject.org>"
deleted file mode 100644
@@ -1,157 +0,0 @@
-From 5fb4ae80ae13ae134a33804b1938af0e9f27a222 Mon Sep 17 00:00:00 2001
-From: Dan Fuhry <dan@fuhry.com>
-Date: Sun, 26 Oct 2025 09:09:07 -0700
-Subject: [PATCH] Backport g(s)size -> g(u)intptr atomics in builtin glib for
- gcc14 and clang15
-
-pkg-config 0.29.2 doesn't build on clang 15 and up and
-gcc 14 and up, due to -Wint-conversion now defaulting to being an error in
-both compilers. The old version of glib 2.36 bundled with pkg-config uses
-gssize/gssize as the return type of the g_atomic_pointer_* functions, which
-newer versions of gcc and clang complain (rightly) is not portable (as
-these are aliased to long and ulong, respectively).
-
-This was previously addressed in glib upstream commit c762d511 [1] by Alex
-Richardson on Dec 14, 2022. The attached patch backports Alex's change to
-glib 2.36 bundled with pkg-config, and also switches to the newer
-__atomic_* intrinsics from commit 2eb37622 [2] (Philip Withnall).
-
-This patch has been tested on clang 17 and only clang 17.
-
-[1]
-https://gitlab.gnome.org/GNOME/glib/-/commit/c762d511346d3cb84cea3557a246ccf8873b4a1c
-[2]
-https://gitlab.gnome.org/GNOME/glib/-/commit/2eb37622418a5c9f31a9d728a99bc621d3157ab0
-
-Upstream-Status: Submitted [https://lists.freedesktop.org/archives/pkg-config/2024-May/001122.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- glib/glib/gatomic.c | 14 +++++++-------
- glib/glib/gatomic.h | 34 ++++++++++++++++++++--------------
- 2 files changed, 27 insertions(+), 21 deletions(-)
-
-diff --git a/glib/glib/gatomic.c b/glib/glib/gatomic.c
-index eb2fe46..c0609eb 100644
---- a/glib/glib/gatomic.c
-+++ b/glib/glib/gatomic.c
-@@ -385,7 +385,7 @@ gboolean
- *
- * Since: 2.30
- **/
--gssize
-+gintptr
- (g_atomic_pointer_add) (volatile void *atomic,
- gssize val)
- {
-@@ -409,11 +409,11 @@ gssize
- *
- * Since: 2.30
- **/
--gsize
-+guintptr
- (g_atomic_pointer_and) (volatile void *atomic,
- gsize val)
- {
-- return g_atomic_pointer_and ((volatile gpointer *) atomic, val);
-+ return g_atomic_pointer_and ((gpointer *) atomic, val);
- }
-
- /**
-@@ -433,11 +433,11 @@ gsize
- *
- * Since: 2.30
- **/
--gsize
-+guintptr
- (g_atomic_pointer_or) (volatile void *atomic,
- gsize val)
- {
-- return g_atomic_pointer_or ((volatile gpointer *) atomic, val);
-+ return g_atomic_pointer_or ((gpointer *) atomic, val);
- }
-
- /**
-@@ -457,11 +457,11 @@ gsize
- *
- * Since: 2.30
- **/
--gsize
-+guintptr
- (g_atomic_pointer_xor) (volatile void *atomic,
- gsize val)
- {
-- return g_atomic_pointer_xor ((volatile gpointer *) atomic, val);
-+ return g_atomic_pointer_xor ((gpointer *) atomic, val);
- }
-
- #elif defined (G_PLATFORM_WIN32)
-diff --git a/glib/glib/gatomic.h b/glib/glib/gatomic.h
-index e7fd1f2..124a3dd 100644
---- a/glib/glib/gatomic.h
-+++ b/glib/glib/gatomic.h
-@@ -66,16 +66,16 @@ gboolean g_atomic_pointer_compare_and_exchange (volatile void *a
- gpointer oldval,
- gpointer newval);
- GLIB_AVAILABLE_IN_ALL
--gssize g_atomic_pointer_add (volatile void *atomic,
-+gintptr g_atomic_pointer_add (volatile void *atomic,
- gssize val);
- GLIB_AVAILABLE_IN_2_30
--gsize g_atomic_pointer_and (volatile void *atomic,
-+guintptr g_atomic_pointer_and (volatile void *atomic,
- gsize val);
- GLIB_AVAILABLE_IN_2_30
--gsize g_atomic_pointer_or (volatile void *atomic,
-+guintptr g_atomic_pointer_or (volatile void *atomic,
- gsize val);
- GLIB_AVAILABLE_IN_ALL
--gsize g_atomic_pointer_xor (volatile void *atomic,
-+guintptr g_atomic_pointer_xor (volatile void *atomic,
- gsize val);
-
- GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_add)
-@@ -167,28 +167,34 @@ G_END_DECLS
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
- (void) (0 ? (gpointer) *(atomic) : 0); \
- (void) (0 ? (val) ^ (val) : 0); \
-- (gssize) __sync_fetch_and_add ((atomic), (val)); \
-+ (guintptr) __atomic_fetch_add ((atomic), (val), __ATOMIC_SEQ_CST); \
- }))
- #define g_atomic_pointer_and(atomic, val) \
- (G_GNUC_EXTENSION ({ \
-+ guintptr *gapa_atomic = (guintptr *) atomic; \
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
-- (void) (0 ? (gpointer) *(atomic) : 0); \
-- (void) (0 ? (val) ^ (val) : 0); \
-- (gsize) __sync_fetch_and_and ((atomic), (val)); \
-+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr)); \
-+ (void) (0 ? (gpointer) *(atomic) : NULL); \
-+ (void) (0 ? (val) ^ (val) : 1); \
-+ (guintptr) __atomic_fetch_and (gapa_atomic, (val), __ATOMIC_SEQ_CST); \
- }))
- #define g_atomic_pointer_or(atomic, val) \
- (G_GNUC_EXTENSION ({ \
-+ guintptr *gapa_atomic = (guintptr *) atomic; \
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
-- (void) (0 ? (gpointer) *(atomic) : 0); \
-- (void) (0 ? (val) ^ (val) : 0); \
-- (gsize) __sync_fetch_and_or ((atomic), (val)); \
-+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr)); \
-+ (void) (0 ? (gpointer) *(atomic) : NULL); \
-+ (void) (0 ? (val) ^ (val) : 1); \
-+ (guintptr) __atomic_fetch_or (gapa_atomic, (val), __ATOMIC_SEQ_CST); \
- }))
- #define g_atomic_pointer_xor(atomic, val) \
- (G_GNUC_EXTENSION ({ \
-+ guintptr *gapa_atomic = (guintptr *) atomic; \
- G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gpointer)); \
-- (void) (0 ? (gpointer) *(atomic) : 0); \
-- (void) (0 ? (val) ^ (val) : 0); \
-- (gsize) __sync_fetch_and_xor ((atomic), (val)); \
-+ G_STATIC_ASSERT (sizeof *(atomic) == sizeof (guintptr)); \
-+ (void) (0 ? (gpointer) *(atomic) : NULL); \
-+ (void) (0 ? (val) ^ (val) : 1); \
-+ (guintptr) __atomic_fetch_xor (gapa_atomic, (val), __ATOMIC_SEQ_CST); \
- }))
-
- #else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */
deleted file mode 100644
@@ -1,36 +0,0 @@
-From b3b26a7e125e5e4f5b69975cc17eb6d33198ebaa Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 11 Apr 2024 14:40:21 +0100
-Subject: [PATCH] Do not use bool as a field name
-
-C99 aliases `bool` to `_Bool`, and C23 introduces `bool` as a reserved
-keyword. Let's avoid using `bool` as a field name.
-
-Upstream-Status: Backport [Backport from glib to bunlded version in pkg-config https://github.com/GNOME/glib/commit/9e320e1c43a4770ed1532248fe5416eb0c618120]
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
----
- glib/glib/goption.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/glib/glib/goption.c b/glib/glib/goption.c
-index 0a22f6f..f439fd4 100644
---- a/glib/glib/goption.c
-+++ b/glib/glib/goption.c
-@@ -166,7 +166,7 @@ typedef struct
- gpointer arg_data;
- union
- {
-- gboolean bool;
-+ gboolean boolean;
- gint integer;
- gchar *str;
- gchar **array;
-@@ -1600,7 +1600,7 @@ free_changes_list (GOptionContext *context,
- switch (change->arg_type)
- {
- case G_OPTION_ARG_NONE:
-- *(gboolean *)change->arg_data = change->prev.bool;
-+ *(gboolean *)change->arg_data = change->prev.boolean;
- break;
- case G_OPTION_ARG_INT:
- *(gint *)change->arg_data = change->prev.integer;
deleted file mode 100644
@@ -1,41 +0,0 @@
-From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Tue, 17 May 2016 13:26:27 +0300
-Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib
-
-This avoids
- error: m4_copy: won't overwrite defined macro: glib_DEFUN
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Pending
-
----
- glib/m4macros/glib-gettext.m4 | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4
-index 5217fd8..155b1d8 100644
---- a/glib/m4macros/glib-gettext.m4
-+++ b/glib/m4macros/glib-gettext.m4
-@@ -313,7 +313,7 @@ msgstr ""
- # on various variables needed by the Makefile.in.in installed by
- # glib-gettextize.
- dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-+AU_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
-
- GLIB_LC_MESSAGES
-@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
-+ ],
-+ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
-
- # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
- # -------------------------------
-2.1.4
-
deleted file mode 100644
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Orignal pkg-config-native action when called as pkg-config-native
-# NO Change here
-if [ "pkg-config-native" = "`basename $0`" ] ; then
- PKG_CONFIG_PATH="@PATH_NATIVE@"
- PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
- unset PKG_CONFIG_SYSROOT_DIR
-else
- # in this case check if we are in the esdk
- if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
- parentpid=`ps -o ppid= -p $$`
- parentpid_info=`ps -wo comm= -o args= -p $parentpid`
-
- # check if we are being called from the kernel's make menuconfig
- if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
- PKG_CONFIG_PATH="@PATH_NATIVE@"
- PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
- unset PKG_CONFIG_SYSROOT_DIR
- fi
- fi
-fi
-
-pkg-config.real "$@"
deleted file mode 100644
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-export PKG_CONFIG_PATH="@PATH_NATIVE@$EXTRA_NATIVE_PKGCONFIG_PATH"
-export PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-unset PKG_CONFIG_SYSROOT_DIR
-
-pkg-config "$@"
deleted file mode 100644
@@ -1,78 +0,0 @@
-SUMMARY = "Helper tool used when compiling"
-DESCRIPTION = "pkg-config is a helper tool used when compiling applications and libraries. It helps determined \
-the correct compiler/link options. It is also language-agnostic."
-HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
-BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config"
-SECTION = "console/utils"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCREV = "d97db4fae4c1cd099b506970b285dc2afd818ea2"
-PV = "0.29.2+git"
-
-SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master;protocol=https \
- file://pkg-config-esdk.in \
- file://pkg-config-native.in \
- file://0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch \
- file://0001-Do-not-use-bool-as-a-field-name.patch \
- file://0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch \
- "
-
-inherit autotools pkgconfig
-
-# Because of a faulty test, the current auto mode always evaluates to no,
-# so just continue that behaviour.
-#
-EXTRA_OECONF += "--disable-indirect-deps"
-
-PACKAGECONFIG ??= "glib"
-PACKAGECONFIG:class-native = ""
-
-PACKAGECONFIG[glib] = "--without-internal-glib,--with-internal-glib,glib-2.0"
-
-BBCLASSEXTEND = "native nativesdk"
-
-# Set an empty dev package to ensure the base PN package gets
-# the pkg.m4 macros, pkgconfig does not deliver any other -dev
-# files.
-FILES:${PN}-dev = ""
-FILES:${PN} += "${datadir}/aclocal/pkg.m4"
-
-# When using the RPM generated automatic package dependencies, some packages
-# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by
-# specifying an appropriate provide.
-RPROVIDES:${PN} += "pkgconfig(pkg-config)"
-
-do_install:append:class-native () {
- # Install a pkg-config-native wrapper that will use the native sysroot instead
- # of the MACHINE sysroot, for using pkg-config when building native tools.
- sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \
- -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \
- < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native
- install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native
- sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \
- -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \
- < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk
- install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk
-}
-
-do_install:append:class-nativesdk () {
- # Install a pkg-config-native wrapper that will use the native sysroot instead
- # of the MACHINE sysroot, for using pkg-config when building native tools.
- sed -e "s|@PATH_NATIVE@|\$OECORE_NATIVE_SYSROOT|" \
- -e "s|@LIBDIR_NATIVE@|\$OECORE_NATIVE_SYSROOT/usr/lib/pkgconfig|" \
- < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native
- install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native
-}
-
-pkgconfig_sstate_fixup_esdk () {
- if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then
- pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}"
- mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real
- ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
- sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native
- fi
-}
-
-SSTATEPOSTUNPACKFUNCS:append:class-native = " pkgconfig_sstate_fixup_esdk"
We're now using pkgconf, so drop the pkgconfig recipe. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/conf/distro/include/maintainers.inc | 1 - ...e-g-u-intptr-atomics-in-builtin-glib.patch | 157 ------------------ ...0001-Do-not-use-bool-as-a-field-name.patch | 36 ---- ...Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 41 ----- .../pkgconfig/pkgconfig/pkg-config-esdk.in | 24 --- .../pkgconfig/pkgconfig/pkg-config-native.in | 7 - .../pkgconfig/pkgconfig_git.bb | 78 --------- 7 files changed, 344 deletions(-) delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-Backport-g-s-size-g-u-intptr-atomics-in-builtin-glib.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-Do-not-use-bool-as-a-field-name.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb