From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path:
Received: by sourceware.org (Postfix, from userid 2181)
id 8F9ED3857415; Mon, 9 May 2022 16:35:37 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F9ED3857415
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r10-10601] libstdc++: Use LTLIBICONV when linking libstdc++.so
[PR93602]
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely
X-Git-Refname: refs/heads/releases/gcc-10
X-Git-Oldrev: f3a0d3a778643bcb82bdf41a67a5ddc1f95c6f53
X-Git-Newrev: 8da8ed881e7cdb2d4b070d685d6d3fe8d31529c2
Message-Id: <20220509163537.8F9ED3857415@sourceware.org>
Date: Mon, 9 May 2022 16:35:37 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list
List-Unsubscribe: ,
List-Archive:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 09 May 2022 16:35:37 -0000
https://gcc.gnu.org/g:8da8ed881e7cdb2d4b070d685d6d3fe8d31529c2
commit r10-10601-g8da8ed881e7cdb2d4b070d685d6d3fe8d31529c2
Author: Jonathan Wakely
Date: Wed Apr 13 14:09:33 2022 +0100
libstdc++: Use LTLIBICONV when linking libstdc++.so [PR93602]
This fixes missing libiconv symbols when libstdc++ is built on a system
that has libiconv installed. If the libiconv headers are found then
libstdc++ depends on libiconv_open etc instead of libc's iconv_open. But
without this fix libstdc++ is not linked to the libiconv library that
provides the definitions of those symbols.
As discussed in PR 93602 this changed means that libstdc++.so.6 might
have an rpath pointing to the location of the libiconv.so library. If
that is not desired, then GCC must be configured to link to a static
libiconv.a instead, using either --with-libiconv-type=static or an
in-tree build of libiconv.
libstdc++-v3/ChangeLog:
PR libstdc++/93602
* doc/xml/manual/prerequisites.xml: Document libiconv
workarounds.
* doc/html/manual/setup.html: Regenerate.
* src/Makefile.am (CXXLINK): Add $(LTLIBICONV).
* src/Makefile.in: Regenerate.
(cherry picked from commit c644b7df11afc818d6308c3776813e50e4ebe551)
Diff:
---
libstdc++-v3/doc/html/manual/setup.html | 33 ++++++++++++++++++
libstdc++-v3/doc/xml/manual/prerequisites.xml | 50 +++++++++++++++++++++++++++
libstdc++-v3/src/Makefile.am | 4 ++-
libstdc++-v3/src/Makefile.in | 4 ++-
4 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/doc/html/manual/setup.html b/libstdc++-v3/doc/html/manual/setup.html
index 636a4401602..069354b8ce0 100644
--- a/libstdc++-v3/doc/html/manual/setup.html
+++ b/libstdc++-v3/doc/html/manual/setup.html
@@ -42,6 +42,39 @@
Finally, a few system-specific requirements:
linux
+ The 'gnu' locale model makes use of iconv
+ for character set conversions. The relevant functions are provided
+ by Glibc and so are always available, however they can also be
+ provided by the separate GNU libiconv library. If GNU libiconv is
+ found when GCC is built (e.g., because its headers are installed
+ in /usr/local/include)
+ then the libstdc++.so.6 library will have a
+ run-time dependency on libiconv.so.2.
+ If you do not want that run-time dependency then you should do
+ one of the following:
+
+ Uninstall the libiconv headers before building GCC.
+ Glibc already provides iconv so you should
+ not need libiconv anyway.
+
+
+ Download the libiconv sources and extract them into the
+ top level of the GCC source tree, e.g.,
+
+ This will build libiconv as part of building GCC and link to
+ it statically, so there is no libiconv.so.2
+ dependency.
+
+ Configure GCC with --with-libiconv-type=static.
+ This requires the static libiconv.a library,
+ which is not installed by default. You might need to reinstall
+ libiconv using the --enable-static configure
+ option to get the static library.
+
If GCC 3.1.0 or later on is being used on GNU/Linux, an attempt
will be made to use "C" library functionality necessary for
C++ named locale support. For GCC 4.6.0 and later, this
diff --git a/libstdc++-v3/doc/xml/manual/prerequisites.xml b/libstdc++-v3/doc/xml/manual/prerequisites.xml
index aa677647555..020027eb86d 100644
--- a/libstdc++-v3/doc/xml/manual/prerequisites.xml
+++ b/libstdc++-v3/doc/xml/manual/prerequisites.xml
@@ -48,6 +48,56 @@
linux
+
+
+ The 'gnu' locale model makes use of iconv
+ for character set conversions. The relevant functions are provided
+ by Glibc and so are always available, however they can also be
+ provided by the separate GNU libiconv library. If GNU libiconv is
+ found when GCC is built (e.g., because its headers are installed
+ in /usr/local/include)
+ then the libstdc++.so.6 library will have a
+ run-time dependency on libiconv.so.2.
+ If you do not want that run-time dependency then you should do
+ one of the following:
+
+
+
+
+ Uninstall the libiconv headers before building GCC.
+ Glibc already provides iconv so you should
+ not need libiconv anyway.
+
+
+
+
+
+ Download the libiconv sources and extract them into the
+ top level of the GCC source tree, e.g.,
+
+
+wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
+tar xf libiconv-1.16.tar.gz
+ln -s libiconv-1.16 libiconv
+
+
+ This will build libiconv as part of building GCC and link to
+ it statically, so there is no libiconv.so.2
+ dependency.
+
+
+
+
+ Configure GCC with .
+ This requires the static libiconv.a library,
+ which is not installed by default. You might need to reinstall
+ libiconv using the configure
+ option to get the static library.
+
+
+
+
+
If GCC 3.1.0 or later on is being used on GNU/Linux, an attempt
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index a139adc81b3..9a97b88ce1f 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -222,7 +222,9 @@ CXXLINK = \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXX) \
$(VTV_CXXLINKFLAGS) \
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) \
+ $(LTLDFLAGS) $(LTLIBICONV) \
+ -o $@
# Symbol versioning for shared libraries.
if ENABLE_SYMVERS
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index ea37a962a9a..8b9b8577a53 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -597,7 +597,9 @@ CXXLINK = \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXX) \
$(VTV_CXXLINKFLAGS) \
- $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) \
+ $(LTLDFLAGS) $(LTLIBICONV) \
+ -o $@
@ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep)
@ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist