diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch deleted file mode 100644 index ee029e9735..0000000000 --- a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 6 Feb 2024 15:33:15 +0100 -Subject: [PATCH] configure.ac: add detection of symver gcc attribute - -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. - -Support for symver needs to be detected via a compile test since -__has_attribute can report false positives [0]. - -Add a configure compile check for __attribute__((symver ..)) to ensure -it is supported and define a variable to advertise support. - -[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 - -Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a - -Signed-off-by: Thomas Petazzoni -[Giulio: rework local patch for #if nesting] -Signed-off-by: Giulio Benetti ---- - configure.ac | 15 +++++++++++++++ - libattr/syscalls.c | 8 ++++---- - 2 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7e362e9..98477b5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,21 @@ AS_CASE([$host_os], - [linux*], [os_linux=yes]) - AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) - -+AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, -+ gcc_cv_symver_attribute, -+ [cat > conftest.c </dev/null 2>&1; then \ -+ gcc_cv_symver_attribute=yes -+ fi -+ rm -f conftest.[cs] -+]) -+AS_IF([test $gcc_cv_symver_attribute = yes], -+ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) -+ - AC_CONFIG_COMMANDS([include/attr], - [dnl - rm -rf include/attr -diff --git a/libattr/syscalls.c b/libattr/syscalls.c -index 907560a..7ee6d39 100644 ---- a/libattr/syscalls.c -+++ b/libattr/syscalls.c -@@ -31,10 +31,10 @@ - * prefer symver attribute if available (since gcc 10), - * fall back to traditional .symver asm directive otherwise. - */ --#ifdef __has_attribute --# if __has_attribute(__symver__) --# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) --# elif __has_attribute(__no_reorder__) -+#if defined(HAVE_SYMVER_ATTRIBUTE) -+# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) -+#elif defined(__has_attribute) -+# if __has_attribute(__no_reorder__) - /* - * Avoid wrong partitioning with older gcc and LTO. May not work reliably - * with all versions; use -flto-partition=none if you encounter problems. --- -2.34.1 - diff --git a/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch deleted file mode 100644 index 304177257c..0000000000 --- a/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001 -From: "Haelwenn (lanodan) Monnier" -Date: Sat, 30 Mar 2024 10:17:10 +0100 -Subject: [PATCH] tools/attr.c: Add missing libgen.h include for basename(3) - -Fixes compilation issue with musl and modern C99 compilers. - -See: https://bugs.gentoo.org/926294 - -Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 - -Signed-off-by: Yegor Yefremov -Signed-off-by: Romain Naour ---- - tools/attr.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/attr.c b/tools/attr.c -index f12e4af..6a3c1e9 100644 ---- a/tools/attr.c -+++ b/tools/attr.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - --- -2.45.0 - diff --git a/package/attr/attr.hash b/package/attr/attr.hash index f63c0e312a..be858a663f 100644 --- a/package/attr/attr.hash +++ b/package/attr/attr.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f2e97b0ab7ce293681ab701915766190d607a1dba7fae8a718138150b700a70b attr-2.5.2.tar.xz +sha256 6c8a2148a7b85043b68492bce43316b0e2e214fc4e628c7ede078e76e216330b attr-2.6.0.tar.xz # Locally calculated sha256 98f318493be6b08bff3cd295791cde06c54e17882a3c74a1ed245eaa02533d52 doc/COPYING diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 1d24144f46..f9bdfa930f 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -4,16 +4,12 @@ # ################################################################################ -ATTR_VERSION = 2.5.2 +ATTR_VERSION = 2.6.0 ATTR_SOURCE = attr-$(ATTR_VERSION).tar.xz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES - -# Flag added for patch dealing with symver in configure.ac -ATTR_AUTORECONF = YES - ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls