Fix libstdc++ install-pdf support.

Message ID 20190701082118.18386-1-jimw@sifive.com
State New
Headers show
Series
  • Fix libstdc++ install-pdf support.
Related show

Commit Message

Jim Wilson July 1, 2019, 8:21 a.m.
Try to run "make install-pdf" on a system with dblatex and pdflatex installed
but not doxygen gives an error.
    run_doxygen error: Could not find Doxygen 1.7.0 in path.
Looking at the build log, I see that this is also using xsltproc and xmllint.
Installing doxygen and running again, I get lots of ignored errors for a
missing dot program.  Looking at the docs I see the collaboration diagrams
are missing.  Installing dot and rebuilding and now I have the collaboration
diagrams.  I don't see any evidence that the pdf docs are using the
stylesheets.  Otherwise, they need everything else that the xml docs need.

Regenerating configure I got an unexpected change, but that is an issue with
a patch a few days ago that added a new thread file, and regenerated the
libgcc configure to use it, but failed to notice that the libstdc++ configure
should have been regenerated too.

Tested with x86_64-linux builds with various packages installed or removed,
and looking at the final docs to make sure they look right.

OK?

Jim

	libstdc++-v3/
	* configure.ac (BUILD_PDF): Also test for doxygen, dot, xsltproc,
	and xmllint.
	* configure: Regenerate.
---
 libstdc++-v3/configure    | 21 +++++++++++++--------
 libstdc++-v3/configure.ac |  4 ++++
 2 files changed, 17 insertions(+), 8 deletions(-)

-- 
2.17.1

Comments

Jonathan Wakely July 1, 2019, 9:18 a.m. | #1
On 01/07/19 01:21 -0700, Jim Wilson wrote:
>Try to run "make install-pdf" on a system with dblatex and pdflatex installed

>but not doxygen gives an error.

>    run_doxygen error: Could not find Doxygen 1.7.0 in path.

>Looking at the build log, I see that this is also using xsltproc and xmllint.

>Installing doxygen and running again, I get lots of ignored errors for a

>missing dot program.  Looking at the docs I see the collaboration diagrams

>are missing.  Installing dot and rebuilding and now I have the collaboration

>diagrams.  I don't see any evidence that the pdf docs are using the

>stylesheets.  Otherwise, they need everything else that the xml docs need.

>

>Regenerating configure I got an unexpected change, but that is an issue with

>a patch a few days ago that added a new thread file, and regenerated the

>libgcc configure to use it, but failed to notice that the libstdc++ configure

>should have been regenerated too.

>

>Tested with x86_64-linux builds with various packages installed or removed,

>and looking at the final docs to make sure they look right.

>

>OK?


OK, thanks.

Patch

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 62d9cb49acf..d06b0440cb5 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15418,6 +15418,7 @@  $as_echo "$target_thread_file" >&6; }
 case $target_thread_file in
     aix)	thread_header=config/rs6000/gthr-aix.h ;;
     dce)	thread_header=config/pa/gthr-dce.h ;;
+    gcn)	thread_header=config/gcn/gthr-gcn.h ;;
     lynx)	thread_header=config/gthr-lynx.h ;;
     mipssde)	thread_header=config/mips/gthr-mipssde.h ;;
     posix)	thread_header=gthr-posix.h ;;
@@ -15637,7 +15638,7 @@  $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
   # Fake what AC_TRY_COMPILE does.
 
     cat > conftest.$ac_ext << EOF
-#line 15640 "configure"
+#line 15641 "configure"
 int main()
 {
   typedef bool atomic_type;
@@ -15672,7 +15673,7 @@  $as_echo "$glibcxx_cv_atomic_bool" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15675 "configure"
+#line 15676 "configure"
 int main()
 {
   typedef short atomic_type;
@@ -15707,7 +15708,7 @@  $as_echo "$glibcxx_cv_atomic_short" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15710 "configure"
+#line 15711 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
@@ -15743,7 +15744,7 @@  $as_echo "$glibcxx_cv_atomic_int" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15746 "configure"
+#line 15747 "configure"
 int main()
 {
   typedef long long atomic_type;
@@ -15896,7 +15897,7 @@  $as_echo "mutex" >&6; }
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15899 "configure"
+#line 15900 "configure"
 int main()
 {
   _Decimal32 d1;
@@ -15938,7 +15939,7 @@  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   # unnecessary for this test.
 
     cat > conftest.$ac_ext << EOF
-#line 15941 "configure"
+#line 15942 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
@@ -15972,7 +15973,7 @@  $as_echo "$enable_int128" >&6; }
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 15975 "configure"
+#line 15976 "configure"
 template<typename T1, typename T2>
   struct same
   { typedef T2 type; };
@@ -81880,7 +81881,11 @@  $as_echo "no" >&6; }
 fi
 
 
- if test $ac_cv_prog_DBLATEX = "yes" &&
+ if test $ac_cv_prog_DOXYGEN = "yes" &&
+	       test $ac_cv_prog_DOT = "yes" &&
+	       test $ac_cv_prog_XSLTPROC = "yes" &&
+	       test $ac_cv_prog_XMLLINT = "yes" &&
+	       test $ac_cv_prog_DBLATEX = "yes" &&
 	       test $ac_cv_prog_PDFLATEX = "yes"; then
   BUILD_PDF_TRUE=
   BUILD_PDF_FALSE='#'
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 2e3a1a98f33..80d8202c337 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -483,6 +483,10 @@  AM_CONDITIONAL(BUILD_MAN,
 AC_CHECK_PROG([DBLATEX], dblatex, yes, no)
 AC_CHECK_PROG([PDFLATEX], pdflatex, yes, no)
 AM_CONDITIONAL(BUILD_PDF,
+	       test $ac_cv_prog_DOXYGEN = "yes" &&
+	       test $ac_cv_prog_DOT = "yes" &&
+	       test $ac_cv_prog_XSLTPROC = "yes" &&
+	       test $ac_cv_prog_XMLLINT = "yes" &&
 	       test $ac_cv_prog_DBLATEX = "yes" &&
 	       test $ac_cv_prog_PDFLATEX = "yes")