xfs
[Top] [All Lists]

[PATCH] xfsprogs: don't hard code the shell binary

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfsprogs: don't hard code the shell binary
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Tue, 28 Jun 2011 17:15:48 +1000
From: Dave Chinner <dchinner@xxxxxxxxxx>

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 <dchinner@xxxxxxxxxx>
---
 include/builddefs.in |    1 +
 include/buildmacros  |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/builddefs.in b/include/builddefs.in
index f895ed9..4c8ec64 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 62babca..31c7eb0 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
 
-- 
1.7.5.1

<Prev in Thread] Current Thread [Next in Thread>