From c31087182fa545784d9a0a01f0b32715d78c3955 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 21:56:10 +0100 Subject: [PATCH] package/libdeflate: bump version to 1.15 Release notes: https://github.com/ebiggers/libdeflate/blob/master/NEWS.md Switch to cmake. Added CFLAGS to fix uClibc build: /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:10: error: 'const struct stat' has no member named 'st_atim'; did you mean 'st_atime'? /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:26: error: 'const struct stat' has no member named 'st_mtim'; did you mean 'st_mtime'? Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.hash | 2 +- package/libdeflate/libdeflate.mk | 27 ++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash index 7dae12921f..79de3439d7 100644 --- a/package/libdeflate/libdeflate.hash +++ b/package/libdeflate/libdeflate.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06 libdeflate-1.12.tar.gz +sha256 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b libdeflate-1.15.tar.gz sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 93ec5909a5..2305af4dc9 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -4,31 +4,12 @@ # ################################################################################ -LIBDEFLATE_VERSION = 1.12 +LIBDEFLATE_VERSION = 1.15 LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES +LIBDEFLATE_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" -ifeq ($(BR2_STATIC_LIBS),y) -LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes -endif - -define LIBDEFLATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) -endef - -define LIBDEFLATE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" PREFIX=/usr install -endef - -define LIBDEFLATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(TARGET_DIR)" PREFIX=/usr install -endef - -$(eval $(generic-package)) +$(eval $(cmake-package))