Fix for PR libc/1686
Mark Kettenis
kettenis@wins.uva.nl
Fri Jul 14 09:28:00 GMT 2000
Here's the promised patch.
I'll close the PR once this has been installed.
Mark
2000-07-14 Mark Kettenis <kettenis@gnu.org>
* configure.in: Check for pwd binary.
* config.make.in: Add PWD_P to be subsituted.
* Makerules: Use $(PWD_P) instead of /bin/pwd.
Index: configure.in
===================================================================
RCS file: /cvs/glibc/libc/configure.in,v
retrieving revision 1.281
diff -u -p -r1.281 configure.in
--- configure.in 2000/07/06 23:28:54 1.281
+++ configure.in 2000/07/14 16:23:31
@@ -505,6 +505,16 @@ if test "$INSTALL" = "${srcdir}/scripts/
fi
AC_PROG_LN_S
+# We need the physical current working directory. We cannot use the
+# "pwd -P" shell builtin since that's not portable. Instead we try to
+# find a pwd binary. Note that assigning to the PWD environment
+# variable might have some interesting side effects, so we don't do
+# that.
+AC_PATH_PROG(PWD_P, pwd, no)
+if test "$PWD_P" = no; then
+ AC_MSG_ERROR(*** A pwd binary could not be found.)
+fi
+
# These programs are version sensitive.
AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
Index: Makerules
===================================================================
RCS file: /cvs/glibc/libc/Makerules,v
retrieving revision 1.339
diff -u -p -r1.339 Makerules
--- Makerules 2000/06/21 18:15:14 1.339
+++ Makerules 2000/07/14 16:23:32
@@ -985,7 +985,7 @@ endif
s = $(sysdep_dir)/generic
$(objpfx)stubs: $(+depfiles)
# Use /dev/null since `...` might expand to empty.
- (s=`cd $s && /bin/pwd`; \
+ (s=`cd $s && $(PWD_P)`; \
$(patsubst %/,cd % &&,$(objpfx)) \
sed -n 's/^stub_warning *(\([^)]*\).*$$/#define __stub_\1/p' \
`sed -n -e '\@ $s/[^ ]*\.c@{; s@^.* $s/\([^ ]*\.c\).*$$@'"$$s"'/\1@; h; }' \
Index: config.make.in
===================================================================
RCS file: /cvs/glibc/libc/config.make.in,v
retrieving revision 1.68
diff -u -p -r1.68 config.make.in
--- config.make.in 2000/05/23 19:22:55 1.68
+++ config.make.in 2000/07/14 16:23:32
@@ -75,6 +75,7 @@ RANLIB = @RANLIB@
MAKEINFO = @MAKEINFO@
AS = $(CC) -c
MIG = @MIG@
+PWD_P = @PWD_P@
# Installation tools.
INSTALL = @INSTALL@
More information about the Libc-hacker
mailing list