bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] squashfs-tools: fix recursive dependency

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@36371 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
luka 2013-04-21 16:34:09 +00:00
parent 95fc83a1d1
commit 0da7d6b3d0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/squashfs-tools/Config.in
View File

@ -1,11 +1,11 @@
if PACKAGE_squashfs-tools-mksquashfs || PACKAGE_squashfs-tools-unsquashfs
config SQUASHFS_TOOLS_LZO_SUPPORT config SQUASHFS_TOOLS_LZO_SUPPORT
depends on PACKAGE_squashfs-tools-mksquashfs || PACKAGE_squashfs-tools-unsquashfs
bool "Enable LZO support" bool "Enable LZO support"
select PACKAGE_liblzo
default y default y
config SQUASHFS_TOOLS_XZ_SUPPORT config SQUASHFS_TOOLS_XZ_SUPPORT
depends on PACKAGE_squashfs-tools-mksquashfs || PACKAGE_squashfs-tools-unsquashfs
bool "Enable XZ support" bool "Enable XZ support"
select PACKAGE_liblzma
default y default y
endif

6
utils/squashfs-tools/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=squashfs-tools PKG_NAME:=squashfs-tools
PKG_VERSION:=4.2 PKG_VERSION:=4.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=squashfs$(PKG_VERSION).tar.gz PKG_SOURCE:=squashfs$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/squashfs PKG_SOURCE_URL:=@SF/squashfs
@ -26,9 +26,7 @@ define Package/squashfs-tools/Default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=squashfs-tools TITLE:=squashfs-tools
DEPENDS += +libpthread +zlib \ DEPENDS += +libpthread +zlib
+SQUASHFS_TOOLS_LZO_SUPPORT:liblzo \
+SQUASHFS_TOOLS_XZ_SUPPORT:liblzma
endef endef
define Package/squashfs-tools-mksquashfs define Package/squashfs-tools-mksquashfs