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))