From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH] xfsprogs: don't hard code the shell binary
Date: Tue, 28 Jun 2011 17:15:48 +1000 [thread overview]
Message-ID: <1309245348-12638-1-git-send-email-david@fromorbit.com> (raw)
From: Dave Chinner <dchinner@redhat.com>
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@redhat.com>
---
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2011-06-28 7:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 7:15 Dave Chinner [this message]
2011-06-28 7:41 ` [PATCH] xfsprogs: don't hard code the shell binary Christoph Hellwig
2011-06-28 8:45 ` Dave Chinner
2011-07-14 18:27 ` Alex Elder
2011-07-16 18:08 ` Christoph Hellwig
2011-07-17 1:48 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309245348-12638-1-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox