From 6d8035f7372e26bbbd7f49aabe328e344355e925 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 3 Feb 2025 21:18:34 +0000 Subject: [PATCH] diffutils: update to 3.11 ann: https://lists.gnu.org/archive/html/info-gnu/2025-02/msg00003.html does not rebuild with autotools 2.72 (as 3.11 was built with a newer version) so patched Makefile.am causes the build failure. build is successful in GHA whereas was previously failing on jenkins - thus the patch for no doc/man removing the patch and going with configure instead of autotools reduces the build tine. --- .../system-tools-depends/diffutils/package.mk | 5 ++--- .../patches/diffutils-001-no-man-or-doc.patch | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk index b9a805ddd2..366097bd4e 100644 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk @@ -2,14 +2,13 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="diffutils" -PKG_VERSION="3.10" -PKG_SHA256="90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" +PKG_VERSION="3.11" +PKG_SHA256="a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/diffutils/" PKG_URL="https://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A package of several programs related to finding differences between files." -PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-sysroot -cfg-libs" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch b/packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch deleted file mode 100644 index b922db7397..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- diffutils-3.5/Makefile.am.org 2017-05-24 18:54:09.404508347 +0200 -+++ diffutils-3.5/Makefile.am 2017-05-24 18:46:25.238456499 +0200 -@@ -19,7 +19,7 @@ - ALL_RECURSIVE_TARGETS = - - EXTRA_DIST = bootstrap exgettext ChangeLog-2008 cfg.mk dist-check.mk --SUBDIRS = lib src tests doc man po gnulib-tests -+SUBDIRS = lib src tests po gnulib-tests - - ACLOCAL_AMFLAGS = -I m4 - AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)