diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-02-27 11:25:44 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-02-27 11:25:44 +0000 |
| commit | a4395a846a9343960714568e7cf8af4425e63a50 (patch) | |
| tree | ccec7e20ed538f582a99e34533b8b0533544b73a /libstdc++-v3/Makefile.in | |
| parent | 5fce606fc2b2bfad6ac252fa32f3bf280b834e6b (diff) | |
| download | gcc-a4395a846a9343960714568e7cf8af4425e63a50.zip gcc-a4395a846a9343960714568e7cf8af4425e63a50.tar.gz gcc-a4395a846a9343960714568e7cf8af4425e63a50.tar.bz2 | |
PR libstdc++/89466 avoid slow xsltproc command in configure
Certain broken versions of xsltproc ignore the --nonet option and will
attempt to fetch the docbook stylesheet from the WWW when it isn't in
the local XML catalog.
This patch checks for the local stylesheet directory first, and doesn't
use xsltproc if no local stylesheets are found. Checking for the local
directory is done using xmlcatalog if available, only checking the
hardcoded list of directories if xmlcatalog fails. The right directory
for Suse is added to the hardcoded list.
This should avoid doing an xsltproc check that would need to download
the stylesheet, so no network connection is made even if a broken
xsltproc is present.
PR libstdc++/89466
* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Reorder check for local
stylesheet directories before check for xsltproc. Try to use
xmlcatalog to find local stylesheet directory before trying hardcoded
paths. Add path used by suse to hardcoded paths. Adjust xsltproc
check to look for the same stylesheet as doc/Makefile.am uses. Don't
use xsltproc if xmlcatalog fails to find a local stylesheet.
* configure.ac: Check for xmlcatalog.
* Makefile.in: Regenerate.
* configure: Likewise.
* doc/Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* libsupc++/Makefile.in: Likewise.
* po/Makefile.in: Likewise.
* python/Makefile.in: Likewise.
* src/Makefile.in: Likewise.
* src/c++11/Makefile.in: Likewise.
* src/c++17/Makefile.in: Likewise.
* src/c++98/Makefile.in: Likewise.
* src/filesystem/Makefile.in: Likewise.
* testsuite/Makefile.in: Likewise.
From-SVN: r269249
Diffstat (limited to 'libstdc++-v3/Makefile.in')
| -rw-r--r-- | libstdc++-v3/Makefile.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 7fe9efb..bf8a7f2 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -295,6 +295,7 @@ VTV_CXXFLAGS = @VTV_CXXFLAGS@ VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@ VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@ WARN_FLAGS = @WARN_FLAGS@ +XMLCATALOG = @XMLCATALOG@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ XSL_STYLE_DIR = @XSL_STYLE_DIR@ |