* Weddington, Eric wrote on Sun, Feb 17, 2008 at 10:30:24PM CET:
>
> Ok. I did the above and ran autoconf in the /gcc subdir. I got this
> error:
>
> if [ xinfo = xinfo ]; then \
> makeinfo --split-size=5000000 --split-size=5000000 --no-split -I
> . -I ../../gcc-4.3-20080215/gcc/doc \
> -I ../../gcc-4.3-20080215/gcc/doc/include -o
> doc/gcc.info ../../gcc-4.3-20080215/gcc/doc/gcc.texi; \
> fi
> ../../gcc-4.3-20080215/gcc/doc//invoke.texi:1244: warning: undefined
> flag: srcdir.
> ../../gcc-4.3-20080215/gcc/doc//invoke.texi:1243: @include `{No value
> for `srcdir'}/../libiberty/at-file.texi': No such file or directory.
> makeinfo: Removing output file `doc/gcc.info' due to errors; use --force
> to preserve.
> make[2]: *** [doc/gcc.info] Error 2
> Is there any reason why we can't revert the patch that caused this?
Well if we do then we need to reopen PR 35148 which would be equivalent
to requiring texinfo 4.11 (on all systems), which was not deemed
desirable earlier in this thread.
What are the contents of your $builddir/gcc/gcc-vers.texi file? Too
much quoting? In that case, could you please delete that file and try
this patch instead (changes to configure included)? All I changed now
was remove quoting from the Makefile rule.
Sorry again for all the trouble.
Thanks,
Ralf
gcc/ChangeLog:
2008-02-17 Ralf Wildenhues <[EMAIL PROTECTED]>
PR bootstrap/35218
* Makefile.in (build_file_translate): New.
(gcc-vers.texi): Use it for translating $(abs_srcdir).
* config.build (build_file_translate): Set to `CMD //c' on MinGW.
* configure.ac (build_file_translate): Substitute it.
* configure: Regenerate.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9c91fb5..be9faaa 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -253,6 +253,8 @@ POD2MAN = pod2man --center="GNU" --release="gcc-$(version)"
# do not correctly set the timestamp due to buggy versions of `utime'
# in the kernel. So, we use `echo' instead.
STAMP = echo timestamp >
+# Translate absolute file names to w32 paths.
+build_file_translate = @build_file_translate@
# Make sure the $(MAKE) variable is defined.
@SET_MAKE@
@@ -3653,7 +3655,7 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
then echo "@set DEVELOPMENT"; \
else echo "@clear DEVELOPMENT"; \
fi) > [EMAIL PROTECTED]
- echo "@set srcdir $(abs_srcdir)" >> [EMAIL PROTECTED]
+ $(build_file_translate) echo @set srcdir $(abs_srcdir) >> [EMAIL
PROTECTED]
if [ -n "$(PKGVERSION)" ]; then \
echo "@set VERSION_PACKAGE $(PKGVERSION)" >> [EMAIL PROTECTED]; \
fi
diff --git a/gcc/config.build b/gcc/config.build
index 4f5421b..62486db 100644
--- a/gcc/config.build
+++ b/gcc/config.build
@@ -47,6 +47,7 @@ build_xm_file=
build_xm_defines=
build_exeext=
build_install_headers_dir=install-headers-tar
+build_file_translate=
# System-specific settings.
case $build in
@@ -79,6 +80,7 @@ case $build in
i[34567]86-*-mingw32* | x86_64-*-mingw*)
build_xm_file=i386/xm-mingw32.h
build_exeext=.exe
+ build_file_translate="CMD //C"
;;
i[34567]86-pc-msdosdjgpp*)
build_xm_file=i386/xm-djgpp.h
diff --git a/gcc/configure b/gcc/configure
index ed7bba1..0347f38 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os target_noncanonical build_libsubdir
build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS
ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn
cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path
valgrind_path_defines valgrind_command coverage_flags enable_multilib
enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT
TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION
REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN
RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA
make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES
FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T
LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file
extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB
CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL
SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC
STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld
ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump
libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir
subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles
all_languages all_selected_languages build_exeext build_install_headers_dir
build_xm_file_list build_xm_include_list build_xm_defines check_languages
cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list
extra_objs extra_parts extra_passes extra_programs float_h_file
gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list
host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files
lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file
out_object_file thread_file tm_file_list tm_include_list tm_defines
tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines
c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS
LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os target_noncanonical build_libsubdir
build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS
ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn
cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path
valgrind_path_defines valgrind_command coverage_flags enable_multilib
enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT
TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION
REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN
RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA
make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES
FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T
LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file
extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB
CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL
SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC
STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld
ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump
libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir
subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles
all_languages all_selected_languages build_exeext build_install_headers_dir
build_xm_file_list build_xm_include_list build_xm_defines build_file_translate
check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs
extra_headers_list extra_objs extra_parts extra_passes extra_programs
float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext
host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj
install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file
objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list
tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list
xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC
LIBOBJS LTLIBOBJS'
ac_subst_files='language_hooks'
# Initialize some variables set by options.
@@ -7057,9 +7057,9 @@ else
case $target in
mips*-*-*)
case $host in
- mips*-sgi-irix*)
- { echo "$as_me:$LINENO: WARNING: fixed-point support is not available
for IRIX" >&5
-echo "$as_me: WARNING: fixed-point support is not available for IRIX" >&2;}
+ mips*-sgi-irix*)
+ { echo "$as_me:$LINENO: WARNING: fixed-point is not supported on
IRIX" >&5
+echo "$as_me: WARNING: fixed-point is not supported on IRIX" >&2;}
enable_fixed_point=no
;;
*)
@@ -17166,6 +17166,7 @@ fi;
+
# Echo link setup.
if test x${build} = x${host} ; then
if test x${host} = x${target} ; then
@@ -17957,6 +17958,7 @@
s,@build_install_headers_dir@,$build_install_headers_dir,;t t
s,@build_xm_file_list@,$build_xm_file_list,;t t
s,@build_xm_include_list@,$build_xm_include_list,;t t
s,@build_xm_defines@,$build_xm_defines,;t t
+s,@build_file_translate@,$build_file_translate,;t t
s,@check_languages@,$check_languages,;t t
s,@cpp_install_dir@,$cpp_install_dir,;t t
s,@xmake_file@,$xmake_file,;t t
diff --git a/gcc/configure.ac b/gcc/configure.ac
index f3bc7b3..bb7c056 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3727,6 +3727,7 @@ AC_SUBST(build_install_headers_dir)
AC_SUBST(build_xm_file_list)
AC_SUBST(build_xm_include_list)
AC_SUBST(build_xm_defines)
+AC_SUBST(build_file_translate)
AC_SUBST(check_languages)
AC_SUBST(cpp_install_dir)
AC_SUBST(xmake_file)
