Changeset b738ceb

Timestamp:

04/16/2019 04:41:13 PM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

d7f7232

Parents:

289c90f

Message:

Change from yaml to libyaml

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

Location:

general

Files:

• genlib/genlib.xml (modified) (2 diffs)
• genlib/libblockdev.xml (modified) (1 diff)
• genlib/libyaml.xml (moved) (moved from general/genlib/yaml.xml ) (6 diffs)
• prog/llvm.xml (modified) (1 diff)
• prog/pyyaml.xml (modified) (1 diff)
• prog/ruby.xml (modified) (1 diff)

general/genlib/genlib.xml

@@ -122 +122 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
 
   <!-- systemd only -->
@@ -149 +150 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
 
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yaml.xml"/>
 </chapter>

general/genlib/libblockdev.xml

@@ -81 +81 @@
       <xref linkend="gobject-introspection"/>,
       <xref linkend="libbytesize"/>, 
-      <xref linkend="parted"/>, 
-      <xref linkend="volume_key"/>, and
-      <xref linkend="yaml"/>
+      <xref linkend="libyaml"/>,
+      <xref linkend="parted"/>, and 
+      <xref linkend="volume_key"/>
     </para>
 

general/genlib/libyaml.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY yaml-download-http "https://github.com/yaml/libyaml/archive/&yaml-version;/yaml-&yaml-version;.tar.gz">
+  <!ENTITY yaml-download-http "https://github.com/yaml/libyaml/archive/&yaml-version;/libyaml-dist-&yaml-version;.tar.gz">
   <!ENTITY yaml-download-ftp  " ">
   <!ENTITY yaml-md5sum        "2ad4119a57f94739cc39a1b482c81264">
   <!ENTITY yaml-size          "80 KB">
-  <!ENTITY yaml-buildsize     "3.0 MB (with tests)">
-  <!ENTITY yaml-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY yaml-buildsize     "6.4 MB (with tests)">
+  <!ENTITY yaml-time          "0.1 SBU (with tests)">
 ]>
 
-<sect1 id="yaml" xreflabel="YAML-&yaml-version;">
-  <?dbhtml filename="yaml.html"?>
+<sect1 id="libyaml" xreflabel="libyaml-&yaml-version;">
+  <?dbhtml filename="libyaml.html"?>
 
   <sect1info>
@@ -21 +21 @@
   </sect1info>
 
-  <title>YAML-&yaml-version;</title>
+  <title>libyaml-&yaml-version;</title>
 
-  <indexterm zone="yaml">
-    <primary sortas="a-YAML">YAML</primary>
+  <indexterm zone="libyaml">
+    <primary sortas="a-libyaml">libyaml</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to YAML</title>
+    <title>Introduction to libyaml</title>
 
     <para>
-      The <application>YAML</application> package contains a C
+      The <application>libyaml</application> package contains a C
       library for parsing and emitting YAML (YAML Ain't Markup
-      Language).
+      Language) code.
     </para>
 
@@ -72 +72 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">YAML Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libyaml Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -80 +80 @@
 
     <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/yaml"/>
+      <ulink url="&blfs-wiki;/libyaml"/>
     </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of YAML</title>
-
-    <note>
-      <para>This package expands to libyaml-&yaml-version;, not
-      the expected yaml-&yaml-version;.</para>
-    </note>
+    <title>Installation of libyaml</title>
 
     <para>
-      Install <application>YAML</application> by running the following
+      Install <application>libyaml</application> by running the following
       commands:
     </para>
 
+    <screen><userinput>./bootstrap                                &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+<!--
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
@@ -103 +103 @@
       -DBUILD_SHARED_LIBS=true    \
       -DCMAKE_BUILD_TYPE=RELEASE ..  &amp;&amp;
-make</userinput></screen>
+make</userinput></screen> -->
 
     <para>
-      To test the results, issue: <command>make test</command>.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -151 +151 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libyaml">
+      <varlistentry id="libyaml-lib">
         <term><filename class="libraryfile">libyaml.so</filename></term>
         <listitem>
           <para>
-            contains API functions for parsing and emitting YAML.
+            contains API functions for parsing and emitting YAML code.
           </para>
-          <indexterm zone="yaml libyaml">
+          <indexterm zone="libyaml libyaml-lib">
             <primary sortas="c-libyaml">libyaml.so</primary>
           </indexterm>

general/prog/llvm.xml

@@ -161 +161 @@
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
       <xref linkend="valgrind"/>,
-      <xref linkend="yaml"/>, <!-- for yaml2obj -->
+      <xref linkend="libyaml"/>, <!-- for yaml2obj -->
       <xref linkend="zip"/>,
       <ulink url="http://www.ocaml.org/">OCaml</ulink>, 

general/prog/pyyaml.xml

@@ -70 +70 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="yaml"/>
+        <xref linkend="libyaml"/>
       </para>
 

general/prog/ruby.xml

@@ -79 +79 @@
       <xref linkend="doxygen"/>,
       <xref linkend="graphviz"/>,
-      <xref linkend="tk"/>,
-      <xref linkend="valgrind"/>, and
-      <xref linkend="yaml"/>
+      <xref linkend="libyaml"/>,
+      <xref linkend="tk"/>, and 
+      <xref linkend="valgrind"/>
     </para>