comment "----------------------------------------------------"
endif
+###############################################################################
+comment "Legacy options removed in 2016.02"
+
+config BR2_PACKAGE_INFOZIP
+ bool "infozip option has been renamed to zip"
+ select BR2_LEGACY
+ select BR2_PACKAGE_ZIP
+ help
+ Info-Zip's Zip package has been renamed from infozip to zip,
+ to avoid ambiguities with Info-Zip's UnZip which has been added
+ in the unzip package.
+
###############################################################################
comment "Legacy options removed in 2015.11"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/gzip/Config.in"
endif
- source "package/infozip/Config.in"
source "package/lz4/Config.in"
source "package/lzip/Config.in"
source "package/lzop/Config.in"
source "package/xz/Config.in"
+ source "package/zip/Config.in"
endmenu
menu "Debugging, profiling and benchmark"
################################################################################
#
-# infozip
+# zip
#
################################################################################
-INFOZIP_VERSION = 30
-INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-INFOZIP_LICENSE = Info-ZIP
-INFOZIP_LICENSE_FILES = LICENSE
+ZIP_VERSION = 30
+ZIP_SOURCE = zip$(ZIP_VERSION).tgz
+ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+ZIP_LICENSE = Info-ZIP
+ZIP_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_BZIP2),y)
-INFOZIP_DEPENDENCIES += bzip2
+ZIP_DEPENDENCIES += bzip2
endif
# Infozip's default CFLAGS.
-INFOZIP_CFLAGS = -I. -DUNIX
+ZIP_CFLAGS = -I. -DUNIX
# Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was
# removed since it can't work for cross-compilation.
-INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT
+ZIP_CFLAGS += -DUIDGID_NOT_16BIT
# infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
# necessary, redefining it on the command line causes some warnings.
-INFOZIP_TARGET_CFLAGS = \
+ZIP_TARGET_CFLAGS = \
$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
-define INFOZIP_BUILD_CMDS
+define ZIP_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
- CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \
+ CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \
AS="$(TARGET_CC) -c" \
-f unix/Makefile generic
endef
-define INFOZIP_INSTALL_TARGET_CMDS
+define ZIP_INSTALL_TARGET_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
prefix=$(TARGET_DIR)/usr
endef
-define HOST_INFOZIP_BUILD_CMDS
+define HOST_ZIP_BUILD_CMDS
$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
- CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \
+ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
AS="$(HOSTCC) -c" \
-f unix/Makefile generic
endef
-define HOST_INFOZIP_INSTALL_CMDS
+define HOST_ZIP_INSTALL_CMDS
$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
prefix=$(HOST_DIR)/usr
endef