This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: r150960 changed ltmain.sh and broke the build
- From: Dave Korn <dave dot korn dot cygwin at googlemail dot com>
- To: Dave Korn <dave dot korn dot cygwin at googlemail dot com>
- Cc: Paolo Bonzini <bonzini at gnu dot org>, NightStrike <nightstrike at gmail dot com>, GCC Patches <gcc-patches at gcc dot gnu dot org>, davek at gcc dot gnu dot org, Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>, Mook - <mook dot gcc at gmail dot com>, Kai Tietz <ktietz70 at googlemail dot com>
- Date: Wed, 26 Aug 2009 12:08:17 +0100
- Subject: Re: r150960 changed ltmain.sh and broke the build
- References: <b609cb3b0908260211q4ca347efw94f4e420d1ac5efc@mail.gmail.com> <4A950CFE.7060709@gmail.com> <4A950C2A.8040204@gnu.org> <4A9510BA.1030704@gmail.com> <4A9512E2.9010104@gmail.com> <4A9512B5.50005@gnu.org> <4A951673.1020108@gmail.com>
[moved from gcc@ to gcc-patches@]
Dave Korn wrote:
> No problem, thanks for worrying about it. Are there any particular
> recommendations about/against problematic separator characters in the 's'
> command? I was going to use an '@'.
>
Here's what I'm testing. NS, you might like to try it locally in parallel
with my testing.
gcc/ChangeLog:
* ltmain.sh (removedotparts): Don't use comma as 's' separator.
(collapseslashes): Likewise.
libjava/classpath/ChangeLog:
* ltmain.sh (removedotparts): Don't use comma as 's' separator.
(collapseslashes): Likewise.
Paolo, is this OK if I test it just by restrapping all the target libs in an
existing $objdir and checking it then all installs correctly?
cheers,
DaveK
Index: libjava/classpath/ltmain.sh
===================================================================
--- libjava/classpath/ltmain.sh (revision 150973)
+++ libjava/classpath/ltmain.sh (working copy)
@@ -173,8 +173,8 @@
# These SED scripts presuppose an absolute path with a trailing slash.
pathcar="s,^/\([^/]*\).*$,\1,"
pathcdr="s,^/[^/]*,,"
-removedotparts="s,/\(\./\)\{1\,\},/,g;s,/\.$,/,"
-collapseslashes="s,/\{1\,\},/,g"
+removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
+collapseslashes="s@/\{1,\}@/@g"
finalslash="s,/*$,/,"
# func_normal_abspath PATH
Index: ltmain.sh
===================================================================
--- ltmain.sh (revision 150973)
+++ ltmain.sh (working copy)
@@ -173,8 +173,8 @@
# These SED scripts presuppose an absolute path with a trailing slash.
pathcar="s,^/\([^/]*\).*$,\1,"
pathcdr="s,^/[^/]*,,"
-removedotparts="s,/\(\./\)\{1\,\},/,g;s,/\.$,/,"
-collapseslashes="s,/\{1\,\},/,g"
+removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
+collapseslashes="s@/\{1,\}@/@g"
finalslash="s,/*$,/,"
# func_normal_abspath PATH