From 212710c929efb2c6a304e5fe180d9d0772a55e42 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 24 Jul 2019 18:30:55 -0700 Subject: [PATCH] xz: Remove bash dependency Bash is not needed here. These scripts are POSIX compliant. This was originally added as the configure script looks for /bin/bash locally. Passing gl_cv_posix_shell overrides this. Signed-off-by: Rosen Penev (cherry-picked from d0e3aa7493edf6110ca80134bd04c839ecc09459) --- utils/xz/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/utils/xz/Makefile b/utils/xz/Makefile index 0b94e5bdd8..3075b9d006 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)) -- 2.30.2