mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -4,12 +4,18 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LZ4_VERSION = 1.8.3
|
||||
LZ4_VERSION = 1.9.2
|
||||
LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION))
|
||||
LZ4_INSTALL_STAGING = YES
|
||||
LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs)
|
||||
LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING
|
||||
|
||||
# CVE-2014-4715 is misclassified (by our CVE tracker) as affecting version
|
||||
# 1.9.2, while in fact this issue has been fixed since lz4-r130:
|
||||
# https://github.com/lz4/lz4/commit/140e6e72ddb6fc5f7cd28ce0c8ec3812ef4a9c08
|
||||
# See https://github.com/lz4/lz4/issues/818
|
||||
LZ4_IGNORE_CVES += CVE-2014-4715
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LZ4_MAKE_OPTS += BUILD_SHARED=no
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
@@ -26,21 +32,31 @@ define HOST_LZ4_INSTALL_CMDS
|
||||
install -C $(@D)
|
||||
endef
|
||||
|
||||
LZ4_DIRS = lib
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LZ4_PROGS),y)
|
||||
LZ4_DIRS += programs
|
||||
endif
|
||||
|
||||
define LZ4_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \
|
||||
-C $(@D) lib
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \
|
||||
-C $(@D) lz4
|
||||
$(foreach dir,$(LZ4_DIRS),\
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \
|
||||
-C $(@D)/$(dir)
|
||||
)
|
||||
endef
|
||||
|
||||
define LZ4_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \
|
||||
PREFIX=/usr $(LZ4_MAKE_OPTS) install -C $(@D)
|
||||
$(foreach dir,$(LZ4_DIRS),\
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \
|
||||
PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install
|
||||
)
|
||||
endef
|
||||
|
||||
define LZ4_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \
|
||||
PREFIX=/usr $(LZ4_MAKE_OPTS) install -C $(@D)
|
||||
$(foreach dir,$(LZ4_DIRS),\
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \
|
||||
PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install
|
||||
)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user