Changeset 42285880 for general

Timestamp:

06/28/2015 08:16:56 PM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

aa9464f

Parents:

1b51238

Message:

Update to scons-2.3.5.
Update to doxygen-1.8.10.
Update to libpcap-1.7.4.
Update to cups-filters-1.0.70.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16184 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general/prog

Files:

• doxygen.xml (modified) (8 diffs)
• scons.xml (modified) (2 diffs)

general/prog/doxygen.xml

@@ -7 +7 @@
   <!ENTITY doxygen-download-http "http://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-download-ftp  "ftp://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
-  <!ENTITY doxygen-md5sum        "3d1a5c26bef358c10a3894f356a69fbc">
-  <!ENTITY doxygen-size          "4.8 MB">
-  <!ENTITY doxygen-buildsize     "119 MB (with doxywizard - additional 26 MB for docs)">
-  <!ENTITY doxygen-time          "1.7 SBU (with doxywizard - additional 1 SBU for docs)">
+  <!ENTITY doxygen-md5sum        "79767ccd986f12a0f949015efb5f058f">
+  <!ENTITY doxygen-size          "4.6 MB">
+  <!ENTITY doxygen-buildsize     "174 MB (with all programs, docs and tests)">
+  <!ENTITY doxygen-time          "2.4 SBU (with all programs, docs and tests)">
 ]>
 
@@ -51 +51 @@
     </para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -88 +88 @@
 
     <bridgehead renderas="sect3">Doxygen Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -93 +98 @@
       <xref linkend="graphviz"/>,
       <xref linkend="gs"/>,
+      <xref linkend="libxml2"/>,
       <xref linkend="llvm"/> (with clang),
       <xref linkend="python2"/> or <xref linkend="python3"/>,
@@ -113 +119 @@
     </para>
 
-<screen><userinput>./configure --prefix /usr \
-            --docdir /usr/share/doc/doxygen-&doxygen-version; &amp;&amp;
+<screen><userinput>cmake -G "Unix Makefiles"         \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      .. &amp;&amp;
+
 make</userinput></screen>
 
     <para>
-      This package does not come with a test suite.
-    </para>
+      To test the results, issue: <command>make tests</command>.
+    </para>
+
+    <para>
+      If you wish to generate the package documentation, you must have
+      <application>Python</application>, <application>TeX Live</application>
+      (for HTML docs) and <application>Ghostscript</application> (for PDF docs)
+      installed, then issue the following command:
+    </para>
+
+<screen><userinput>sed -i 's:man/man1:share/&amp;:' ../doc/CMakeLists.txt &amp;&amp;
+
+cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
+
+make docs</userinput></screen>
 
     <para>
@@ -125 +147 @@
     </para>
 
-<screen role="root"><userinput>make MAN1DIR=share/man/man1 install</userinput></screen>
-
-    <para>
-      If you wish to generate and install the package documentation
-      (note that man pages have already been installed), you must have
-      <application>Python</application>,
-      <application>TeX Live</application> (for HTML docs) and
-      <application>Ghostscript</application> (for PDF docs)
-      installed, then issue the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install_docs</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -vm644 ../doc/*.1 /usr/man/man1</userinput></screen>
+
+    <para>
+
+      If you generated the package documentation, install with the following
+      command, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make docs install</userinput></screen>
 
   </sect2>
@@ -145 +164 @@
 
     <para>
-      <option>--with-doxywizard</option>: Use this switch if
+      <command>sed -i ... CMakeLists.txt</command>: Fixes the directory where
+      the man pages are installed.
+    </para>
+
+    <para>
+      <option>-Dbuild_wizard=ON</option>: Use this switch if
       <application>Qt4</application> is installed and you wish to build the GUI
-      front-end. If both <application>Qt4</application> and
-      <application>Qt5</application> are installed, use <command>source
-      setqt4</command>. If <application>Qt4</application> is installed in
-      <filename class="directory">/opt</filename>, issue <command>export
-      QTDIR=$QT4DIR</command>.
-    </para>
-
-    <para>
-      <option>--with-doxysearch</option>: Use this switch if
+      front-end.
+    </para>
+
+    <para>
+      <option>-Dbuild_search=ON</option>: Use this switch if
       <application>xapian</application> is installed and you wish to build
       external search tools (<command>doxysearch.cgi</command> and
@@ -162 +182 @@
 
     <para>
-      <option>--with-libclang</option>: Use this switch if
+      <option>-Duse_libclang=ON</option>: Use this switch if
       <application>llvm</application> with <application>clang</application> are
-      installed, to add support for libclang parsing.</para>
+      installed, to add support for libclang parsing.
+    </para>
+
   </sect2>
 

general/prog/scons.xml

@@ -7 +7 @@
   <!ENTITY scons-download-http "&sourceforge-repo;/scons/scons-&scons-version;.tar.gz">
   <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "91fbbb67c2c65b03c746601baac4a6a5">
-  <!ENTITY scons-size          "608 KB">
-  <!ENTITY scons-buildsize     "12 MB">
+  <!ENTITY scons-md5sum        "a8988c7ef11133bb3b6ccf0af67ce010">
+  <!ENTITY scons-size          "500 KB">
+  <!ENTITY scons-buildsize     "11 MB">
   <!ENTITY scons-time          "less than 0.1 SBU">
 ]>
@@ -35 +35 @@
     </para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>