[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: bootstrap warning
From: |
Ralf Wildenhues |
Subject: |
FYI: bootstrap warning |
Date: |
Wed, 26 Oct 2005 16:26:53 +0200 |
User-agent: |
Mutt/1.5.11 |
Hi Eric,
* Eric Blake wrote on Wed, Oct 26, 2005 at 02:55:11PM CEST:
> According to Eric Blake on 10/26/2005 6:46 AM:
> >
> > * Makefile.am (vcl-tmp): Avoid warnings from diff.
> > * bootstrap: Avoid warnings from find.
Which find version is this?
> Also, emacs whitespace-cleanup doesn't like the fact that bootstrap has
> space followed by a literal tab in my_sed_traces; and it tried to 'help'
> me by flattening that into a single tab (of course, changing the sed
> expression in the process). Is it safe to use \t instead of literal tab
> in a sed expression?
No, it's not. I have applied the patch below to CVS HEAD, which should
fix all issues.
Thanks for reporting!
Cheers,
Ralf
2005-10-26 Eric Blake <address@hidden>,
Ralf Wildenhues <address@hidden>
* Makefile.am (vcl-tmp): Avoid warnings from diff.
* bootstrap: Avoid warnings from find.
(lt_tab): Use to prevent editor whitespace "cleanup".
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.173
diff -u -r1.173 Makefile.am
--- Makefile.am 26 Oct 2005 10:42:02 -0000 1.173
+++ Makefile.am 26 Oct 2005 14:20:09 -0000
@@ -138,7 +138,7 @@
vcl-tmp:
@set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
echo "$$1" > vcl.tmp; \
- diff vcl.tmp $(srcdir)/stamp-vcl >/dev/null \
+ diff vcl.tmp $(srcdir)/stamp-vcl >/dev/null 2>/dev/null \
|| (echo "Updating stamp-vcl"; cp vcl.tmp $(srcdir)/stamp-vcl)
address@hidden -f vcl.tmp
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.71
diff -u -r1.71 bootstrap
--- bootstrap 26 Oct 2005 10:42:03 -0000 1.71
+++ bootstrap 26 Oct 2005 14:20:09 -0000
@@ -44,13 +44,14 @@
# Extract auxdir and m4dir from configure.ac:
+lt_tab=' '
my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
- /AC_CONFIG_AUX_DIR[^_]/ {
- s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,auxdir=\1,; p;
- };
- /AC_CONFIG_MACRO_DIR/ {
- s,^.*AC_CONFIG_MACRO_DIR([[ ]*\([^])]*\).*$,m4dir=\1,; p;
- };
+ /AC_CONFIG_AUX_DIR[^_]/ {
+ s,^.*AC_CONFIG_AUX_DIR([[ '"$lt_tab"']*\([^])]*\).*$,auxdir=\1,; p;
+ };
+ /AC_CONFIG_MACRO_DIR/ {
+ s,^.*AC_CONFIG_MACRO_DIR([[ '"$lt_tab"']*\([^])]*\).*$,m4dir=\1,; p;
+ };
d;'
eval `cat configure.ac 2>/dev/null | $SED "$my_sed_traces"`
@@ -65,7 +66,7 @@
WARNING: `lt~obsolete.m4'). After that, retry this bootstrap.
EOF
-find . \( -name autom4te.cache -o -name libtool \) -depth -print \
+find . -depth \( -name autom4te.cache -o -name libtool \) -print \
| grep -v '{arch}' \
| xargs rm -rf