On Mon, 22 Jan 2007, Kevin Ryde wrote:
> I made this change:
>
bash-2.05$ /bin/rm -rf guile-1.8.1
bash-2.05$ gtar -zxf guile-1.8.1.tar.gz
bash-2.05$ cd guile-1.8.1
bash-2.05$ gpatch < ../guile-configure.in.echo-n.diff
patching file configure.in
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej
bash-2.05$ gpatch --version
patch 2.5.4
Copyright 1984-1988 Larry Wall
Copyright 1989-1999 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
written by Larry Wall and Paul Eggert
bash-2.05$ more configure.in.rej
***************
*** 27,34 ****
AC_PREREQ(2.53)
- AC_INIT(m4_esyscmd(. ./GUILE-VERSION && echo -n ${PACKAGE}),
- m4_esyscmd(. ./GUILE-VERSION && echo -n ${GUILE_VERSION}),
[EMAIL PROTECTED])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_SRCDIR(GUILE-VERSION)
--- 27,41 ----
AC_PREREQ(2.53)
+ dnl `patsubst' here deletes the newline which "echo" prints. We can't use
+ dnl "echo -n" since -n is not portable (see autoconf manual "Limitations of
+ dnl Builtins"), in particular on solaris it results in a literal "-n" in
+ dnl the output.
+ dnl
+ AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[
+ ]),
+ patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
+ ]),
[EMAIL PROTECTED])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_SRCDIR(GUILE-VERSION)
bash-2.05$
bash-2.05$
Hmm, I don't understand why that failed... I shouldn't need a -p0
given the paths...
bash-2.05$ gpatch -p0 < ../guile-configure.in.echo-n.diff
patching file configure.in
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej
bash-2.05$ gpatch -p1 < ../guile-configure.in.echo-n.diff
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- configure.in.~1.268.2.28.~ 2006-12-27 10:32:04.000000000 +1100
|+++ configure.in 2007-01-22 10:03:13.000000000 +1100
--------------------------
File to patch: configure.in
patching file configure.in
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej
bash-2.05$
I'm stumped. And sun's native patch implementation chokes on this.
Hugh
_______________________________________________
Guile-user mailing list
Guile-user@gnu.org
http://lists.gnu.org/mailman/listinfo/guile-user
