r3286 - in glibc-package/trunk/debian: . patches/any rules.d
Author: aurel32
Date: 2009-02-19 17:01:59 +0000 (Thu, 19 Feb 2009)
New Revision: 3286
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-bashisms.diff
glibc-package/trunk/debian/rules.d/build.mk
Log:
* rules.d/build.mk: define SHELL as /bin/bash.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-02-19 12:43:03 UTC (rev 3285)
+++ glibc-package/trunk/debian/changelog 2009-02-19 17:01:59 UTC (rev 3286)
@@ -5,6 +5,7 @@
machines using cpufreq.
* Rename submitted/cvs-tsd.diff into hppa/cvs-tsd.diff.
* patches/any/local-bashisms.diff: fix more bashisms in the testsuite.
+ * rules.d/build.mk: define SHELL as /bin/bash.
* patches/any/cvs-pthread_h.diff: patch from upstream to fix warning
in pthread.h.
Modified: glibc-package/trunk/debian/patches/any/local-bashisms.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-bashisms.diff 2009-02-19 12:43:03 UTC (rev 3285)
+++ glibc-package/trunk/debian/patches/any/local-bashisms.diff 2009-02-19 17:01:59 UTC (rev 3286)
@@ -2,14 +2,6 @@
nptl/tst-tls6.sh | 1 +-
2 files changed, 1 insertions(+), 1 deletions(-)
---- a/nptl/tst-tls6.sh
-+++ b/nptl/tst-tls6.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- common_objpfx=$1; shift
- elf_objpfx=$1; shift
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -544,7 +544,7 @@ $(objpfx)pt-initfini.s: pt-initfini.c
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2009-02-19 12:43:03 UTC (rev 3285)
+++ glibc-package/trunk/debian/rules.d/build.mk 2009-02-19 17:01:59 UTC (rev 3286)
@@ -31,6 +31,7 @@
echo "LDFLAGS = " >> $(DEB_BUILDDIR)/configparms
echo "BASH := /bin/bash" >> $(DEB_BUILDDIR)/configparms
echo "KSH := /bin/bash" >> $(DEB_BUILDDIR)/configparms
+ echo "SHELL := /bin/bash" >> $(DEB_BUILDDIR)/configparms
echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms
echo "bindir = $(bindir)" >> $(DEB_BUILDDIR)/configparms
echo "datadir = $(datadir)" >> $(DEB_BUILDDIR)/configparms
Reply to: