Przeglądaj źródła

package/busybox: invert dependency with gzip

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Yann E. MORIN 7 lat temu
rodzic
commit
c2cf255b67
2 zmienionych plików z 1 dodań i 2 usunięć
  1. 1 0
      package/busybox/busybox.mk
  2. 0 2
      package/gzip/gzip.mk

+ 1 - 0
package/busybox/busybox.mk

@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 
 # Packages that provide commands that may also be busybox applets:
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_GZIP),gzip) \
 	$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
 	$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
 	$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
 	$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
 	$(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \
 	$(if $(BR2_PACKAGE_IFPLUGD),ifplugd) \

+ 0 - 2
package/gzip/gzip.mk

@@ -9,8 +9,6 @@ GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 # Some other tools expect it to be in /bin
 # Some other tools expect it to be in /bin
 GZIP_CONF_OPTS = --exec-prefix=/
 GZIP_CONF_OPTS = --exec-prefix=/
-# Prefer full gzip over potentially lightweight/slower from busybox
-GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 GZIP_LICENSE = GPL-3.0+
 GZIP_LICENSE = GPL-3.0+
 GZIP_LICENSE_FILES = COPYING
 GZIP_LICENSE_FILES = COPYING
 GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
 GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes