Skip to contentSkip to conversation

Don't build host-xz needlessly

PATCH New Baruch Siach 3 participants 3 messages Apr 6, 2014 – Apr 7, 2014 VFS

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 Don't build host-xz needlessly

Since commit d1f325f554cab (xzcat: treat as host prerequisite and build if needed) host-xz is always built when the host does not have xz installed. Removed all other host-xz dependencies.

Cc Thomas De Schampheleire <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 fs/common.mk                 | 1 -
 package/squashfs/squashfs.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
fs/common.mk +0 -1
index d95c26ba5c43..080b8c687efb 100644
@@ -59,7 +59,6 @@ ROOTFS_$(2)_COMPRESS_EXT = .lzo
 ROOTFS_$(2)_COMPRESS_CMD = $$(LZOP) -9 -c
 endif
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y)
-ROOTFS_$(2)_DEPENDENCIES += host-xz
 ROOTFS_$(2)_COMPRESS_EXT = .xz
 ROOTFS_$(2)_COMPRESS_CMD = $$(XZ) -9 -C crc32 -c
 endif
package/squashfs/squashfs.mk +1 -1
index bff308c2fd57..8c6350ab4a91 100644
@@ -40,7 +40,7 @@ SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
 endif
 
 
-HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lzo host-xz
+HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lzo
 
 # no libattr/xz in BR
 HOST_SQUASHFS_MAKE_ARGS = \
Signature · 1 line
1.9.1
#2 lore raw

PATCH 1/1 Don't build host-xz needlessly

In reply to Baruch Siach
Quoted 30 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Since commit d1f325f554cab (xzcat: treat as host prerequisite and build if needed) host-xz is always built when the host does not have xz installed. Removed all other host-xz dependencies.

Cc Thomas De Schampheleire <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 fs/common.mk                 | 1 -
 package/squashfs/squashfs.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
fs/common.mk +0 -1
index d95c26ba5c43..080b8c687efb 100644
@@ -59,7 +59,6 @@ ROOTFS_$(2)_COMPRESS_EXT = .lzo
 ROOTFS_$(2)_COMPRESS_CMD = $$(LZOP) -9 -c
 endif
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_XZ),y)
-ROOTFS_$(2)_DEPENDENCIES += host-xz
 ROOTFS_$(2)_COMPRESS_EXT = .xz
 ROOTFS_$(2)_COMPRESS_CMD = $$(XZ) -9 -C crc32 -c
 endif
package/squashfs/squashfs.mk +0 -0
index bff308c2fd57..8c6350ab4a91 100644

package/squashfs/squashfs.mk SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0 · line 43

Quoted 5 lines
package/squashfs/squashfs.mk +1 -1
@@ -40,7 +40,7 @@ SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
 endif
 
 
-HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lzo host-xz
+HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lzo

squashfs needs the libxz development files, which might not be available just because xzcat is, so I've dropped this line and committed - Thanks.

Signature · 1 line
Bye, Peter Korsgaard