From 6abbfed5d6a31b7bd7607a0be9a634b18ec57bee Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Sun, 17 Jul 2011 03:41:19 +1000 Subject: [PATCH] xfsprogs: don't hard code the shell binary Recent changes to debian unstable user space have caused the xfsprogs build to break as certain shell functionality is being assumed by libtool and friends. The configure scripts test and select the correct shell, but the input files ignore this and hard code the shell to use and hence now break. Fix this by using the shell that the configure scripts decide is the right one to use. Signed-off-by: Dave Chinner --- include/builddefs.in | 1 + include/buildmacros | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/builddefs.in b/include/builddefs.in index f895ed91d..4c8ec645c 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -71,6 +71,7 @@ MAKE = @make@ ECHO = @echo@ SORT = @sort@ LN_S = @LN_S@ +SHELL = @SHELL@ LIBTOOL = @LIBTOOL@ MAKEDEPEND = @makedepend@ diff --git a/include/buildmacros b/include/buildmacros index 62babca2a..31c7eb013 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -32,7 +32,6 @@ OBJECTS = $(ASFILES:.s=.o) \ INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -SHELL = /bin/sh IMAGES_DIR = $(TOPDIR)/all-images DIST_DIR = $(TOPDIR)/dist -- 2.47.2