aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2019-07-25 10:55:04 -0700
committerGitHub <noreply@github.com>2019-07-25 10:55:04 -0700
commit789f2d40be513efe061233a51804ced19a420ade (patch)
treeefb8f8d74033775c6f9720f859f73ff0dd73bdbc /utils
parentbc63d21dee09e35e0c8d4dc5a4ac6c664f83bedb (diff)
parentd0e3aa7493edf6110ca80134bd04c839ecc09459 (diff)
Merge pull request #9563 from neheb/xz3
xz: Remove bash dependency
Diffstat (limited to 'utils')
-rw-r--r--utils/xz/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/utils/xz/Makefile b/utils/xz/Makefile
index 0b94e5bdd..3075b9d00 100644
--- a/utils/xz/Makefile
+++ b/utils/xz/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xz
PKG_VERSION:=5.2.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/lzmautils
@@ -83,6 +83,9 @@ CONFIGURE_ARGS += \
--disable-werror \
--with-pic
+CONFIGURE_VARS += \
+ gl_cv_posix_shell=/bin/sh
+
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) \
@@ -114,7 +117,7 @@ $(eval $(call BuildSubPackage,lzmadec, +liblzma,))
$(eval $(call BuildSubPackage,lzmainfo, +liblzma,))
$(eval $(call BuildSubPackage,xz, +liblzma, lzcat lzma unlzma unxz xzcat))
$(eval $(call BuildSubPackage,xzdec, +liblzma,))
-$(eval $(call BuildSubPackage,xzdiff, +bash +xz, lzcmp lzdiff xzcmp))
-$(eval $(call BuildSubPackage,xzgrep, +bash +xz, lzegrep lzfgrep lzgrep xzegrep xzfgrep))
-$(eval $(call BuildSubPackage,xzless, +bash +xz, lzless))
-$(eval $(call BuildSubPackage,xzmore, +bash +xz, lzmore))
+$(eval $(call BuildSubPackage,xzdiff, +xz, lzcmp lzdiff xzcmp))
+$(eval $(call BuildSubPackage,xzgrep, +xz, lzegrep lzfgrep lzgrep xzegrep xzfgrep))
+$(eval $(call BuildSubPackage,xzless, +xz, lzless))
+$(eval $(call BuildSubPackage,xzmore, +xz, lzmore))