This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
A glibc patch for libstdc++ v3
- To: bkoz at haight dot constant dot com
- Subject: A glibc patch for libstdc++ v3
- From: "H . J . Lu" <hjl at valinux dot com>
- Date: Mon, 24 Jul 2000 18:24:26 -0700
- Cc: gcc-patches at gcc dot gnu dot org, Ulrich Drepper <drepper at cygnus dot com>
You checked some patches into src/Makefile.{am,in} on 2000-07-23, which
I cannot find any relevant ChangeLog entries for. They break libstdc++
v3 under glibc 2.2 since libstdc++ v3 can no longer find the private
libio header files when built under glibc 2.2. Here is the patch.
--
H.J. Lu (hjl@gnu.org)
--
2000-07-24 H.J. Lu (hjl@gnu.org)
* src/Makefile.am (LIBIO_INCLUDES): Set to -I$(top_srcdir)/libio
even if GLIBCPP_NEED_LIBIO is false. The installed glibc header
files don't include private libio header files needed by
libstdc++ v3.
* src/Makefile.in: Rebuild.
Index: src/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/egcs/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.1.1.11
diff -u -p -r1.1.1.11 Makefile.am
--- src/Makefile.am 2000/07/24 21:12:11 1.1.1.11
+++ src/Makefile.am 2000/07/25 01:13:41
@@ -64,7 +64,7 @@ if GLIBCPP_NEED_LIBIO
LIBIO_INCLUDES = \
-I$(top_builddir)/libio -I$(top_srcdir)/libio
else
-LIBIO_INCLUDES =
+LIBIO_INCLUDES = -I$(top_srcdir)/libio
endif
if GLIBCPP_USE_CSHADOW
Index: src/Makefile.in
===================================================================
RCS file: /work/cvs/gnu/egcs/libstdc++-v3/src/Makefile.in,v
retrieving revision 1.1.1.12
diff -u -p -r1.1.1.12 Makefile.in
--- src/Makefile.in 2000/07/24 21:12:11 1.1.1.12
+++ src/Makefile.in 2000/07/25 01:14:14
@@ -137,7 +137,7 @@ AM_CXXFLAGS = \
TOPLEVEL_INCLUDES = -I$(includedir)
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_TRUE@\
@GLIBCPP_NEED_LIBIO_TRUE@ -I$(top_builddir)/libio -I$(top_srcdir)/libio
-@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES =
+@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = -I$(top_srcdir)/libio
#CSHADOW_INCLUDES = \
# @CSHADOWFLAGS@ -I$(top_srcdir)/shadow -I$(top_builddir)/cshadow
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_INCLUDES =