This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix breakage where no system libintl is available
- From: Paolo Bonzini <paolo dot bonzini at polimi dot it>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 25 May 2004 13:05:10 +0200
- Subject: [PATCH] Fix breakage where no system libintl is available
There is a misunderstanding between Makefiles using automake (libcpp's) and
hand-written ones (gcc's) about what is the top_builddir. gcc defines it to ..
(path to the toplevel) while libcpp defines it to . (path to config.status).
libintl assumes the former, but since gcc mutuated the name of top_builddir from
Automake-generated Makefiles the following patch should be applied that fixes
the inconsistency.
I was about to commit it as obvious, but I'd rather have an explicit ok.
Paolo
ps: can anybody explain why I've been bootstrapping 3 times a day with the same
patch I committed, without observing the breakage that Rainer reported?
gcc/ChangeLog:
2004-04-25 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in (top_builddir): Define to .
intl/ChangeLog:
2004-04-25 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Point config.intl to the parent directory of
${top_builddir}.
Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1284
diff -u -r1.1284 Makefile.in
--- gcc/Makefile.in 24 May 2004 17:34:14 -0000 1.1284
+++ gcc/Makefile.in 25 May 2004 10:59:29 -0000
@@ -77,8 +77,8 @@
abs_srcdir = @abs_srcdir@
abs_docdir = @abs_srcdir@/doc
-# Top build directory, relative to here.
-top_builddir = ..
+# Top build directory for this package, relative to here.
+top_builddir = .
# objdir is set by configure.
# It's normally the absolute path to the current directory.
objdir = @objdir@
cvs server: Diffing intl
Index: intl/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/intl/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- intl/configure.ac 11 Mar 2004 00:27:37 -0000 1.2
+++ intl/configure.ac 25 May 2004 10:59:29 -0000
@@ -24,8 +24,8 @@
INCINTL=
case $USE_INCLUDED_LIBINTL in
yes)
- LIBINTL_DEP='${top_builddir}/intl/libintl.a'
- INCINTL='-I${top_builddir}/intl'
+ LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
+ INCINTL='-I${top_builddir}/../intl'
;;
esac
-------------------------------------------------
This mail sent through IMP: http://horde.org/imp/