Ticket #3419: pkgconf.patch

File pkgconf.patch, 12.2 KB (added by Igor Živković, 11 years ago)

  • BOOK/appendices/dependencies.xml 

    diff -Naur LFS.orig/BOOK/appendices/dependencies.xml LFS/BOOK/appendices/dependencies.xml
    old new  
    16191619        </seglistitem>
    16201620      </segmentedlist>
    16211621
    1622 <!-- Begin Pkg-config dependency info -->
    1623   <bridgehead renderas="sect2" id="pkgconfig-dep">Pkg-config</bridgehead>
     1622<!-- Begin Pkgconf dependency info -->
     1623  <bridgehead renderas="sect2" id="pkgconf-dep">Pkgconf</bridgehead>
    16241624
    16251625      <segmentedlist>
    16261626        <segtitle>&dependencies;</segtitle>
    16271627
    16281628        <seglistitem>
    16291629         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
    1630          Popt, and Sed</seg>
     1630         and Sed</seg>
    16311631        </seglistitem>
    16321632      </segmentedlist>
    16331633
    … …  
    16781678        <segtitle>&before;</segtitle>
    16791679
    16801680        <seglistitem>
    1681           <seg>Pkg-config</seg>
     1681          <seg>Pkgconf</seg>
    16821682        </seglistitem>
    16831683      </segmentedlist>
    16841684

  • BOOK/chapter01/whatsnew.xml 

    diff -Naur LFS.orig/BOOK/chapter01/whatsnew.xml LFS/BOOK/chapter01/whatsnew.xml
    old new  
    161161      <para>Perl &perl-version;</para>
    162162    </listitem>-->
    163163    <!--<listitem>
    164       <para>Pkg-config &pkgconfig-version;</para>
     164      <para>Pkgconf &pkgconf-version;</para>
    165165    </listitem>-->
    166166    <!--<listitem>
    167167      <para>Procps-ng &procps-ng-version;</para>

  • BOOK/chapter03/packages.xml 

    diff -Naur LFS.orig/BOOK/chapter03/packages.xml LFS/BOOK/chapter03/packages.xml
    old new  
    459459    </varlistentry>
    460460
    461461    <varlistentry>
    462       <term>Pkg-config (&pkgconfig-version;) - <token>&pkgconfig-size;</token>:</term>
     462      <term>Pkgconf (&pkgconf-version;) - <token>&pkgconf-size;</token>:</term>
    463463      <listitem>
    464         <para>Home page: <ulink url="&pkgconfig-home;"/></para>
    465         <para>Download: <ulink url="&pkgconfig-url;"/></para>
    466         <para>MD5 sum: <literal>&pkgconfig-md5;</literal></para>
     464        <para>Home page: <ulink url="&pkgconf-home;"/></para>
     465        <para>Download: <ulink url="&pkgconf-url;"/></para>
     466        <para>MD5 sum: <literal>&pkgconf-md5;</literal></para>
    467467      </listitem>
    468468    </varlistentry>
    469469

  • BOOK/chapter06/chapter06.xml 

    diff -Naur LFS.orig/BOOK/chapter06/chapter06.xml LFS/BOOK/chapter06/chapter06.xml
    old new  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
    33   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
     33  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
    3434  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>

  • BOOK/chapter06/e2fsprogs.xml 

    diff -Naur LFS.orig/BOOK/chapter06/e2fsprogs.xml LFS/BOOK/chapter06/e2fsprogs.xml
    old new  
    7070      <varlistentry>
    7171        <term><parameter>PKG_CONFIG...</parameter></term>
    7272        <listitem>
    73           <para>This enables E2fsprogs to be built without requiring Pkg-config
     73          <para>This enables E2fsprogs to be built without requiring Pkgconf
    7474          to be built and installed first.</para>
    7575        </listitem>
    7676      </varlistentry>

  • BOOK/chapter06/pkgconfig.xml 

    diff -Naur LFS.orig/BOOK/chapter06/pkgconfig.xml LFS/BOOK/chapter06/pkgconfig.xml
    old new  
    1 <?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    3   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    4   <!ENTITY % general-entities SYSTEM "../general.ent">
    5   %general-entities;
    6 ]>
    7 
    8 <sect1 id="ch-system-pkgconfig" role="wrap">
    9   <?dbhtml filename="pkg-config.html"?>
    10 
    11   <sect1info condition="script">
    12     <productname>pkgconfig</productname>
    13     <productnumber>&pkgconfig-version;</productnumber>
    14     <address>&pkgconfig-url;</address>
    15   </sect1info>
    16 
    17   <title>Pkg-config-&pkgconfig-version;</title>
    18 
    19   <indexterm zone="ch-system-pkgconfig">
    20     <primary sortas="a-pkgconfig">Pkgconfig</primary>
    21   </indexterm>
    22 
    23   <sect2 role="package">
    24     <title/>
    25 
    26     <para> The pkg-config package contains a tool for passing the include path
    27     and/or library paths to build tools during the configure and make file
    28     execution.</para>
    29 
    30     <segmentedlist>
    31       <segtitle>&buildtime;</segtitle>
    32       <segtitle>&diskspace;</segtitle>
    33 
    34       <seglistitem>
    35         <seg>&pkgconfig-ch6-sbu;</seg>
    36         <seg>&pkgconfig-ch6-du;</seg>
    37       </seglistitem>
    38     </segmentedlist>
    39 
    40   </sect2>
    41 
    42   <sect2 role="installation">
    43     <title>Installation of Pkg-config</title>
    44 
    45     <para>Prepare Pkg-config for compilation:</para>
    46 
    47 <screen><userinput remap="configure">./configure --prefix=/usr         \
    48             --with-internal-glib  \
    49             --disable-host-tool   \
    50             --docdir=/usr/share/doc/pkg-config-&pkgconfig-version;</userinput></screen>
    51 
    52     <variablelist>
    53       <title>The meaning of the new configure options:</title>
    54 
    55       <varlistentry>
    56         <term><parameter>--with-internal-glib</parameter></term>
    57         <listitem>
    58           <para>This will allow pkg-config to use its internal version of
    59           Glib because an external version is not available in LFS.</para>
    60         </listitem>
    61       </varlistentry>
    62 
    63       <varlistentry>
    64         <term><parameter>--disable-host-tool</parameter></term>
    65         <listitem>
    66           <para>This option disables the creation of an undesired hard link
    67           to the pkg-config program.</para>
    68         </listitem>
    69       </varlistentry>
    70 
    71     </variablelist>
    72 
    73 
    74 
    75     <para>Compile the package:</para>
    76 
    77 <screen><userinput remap="make">make</userinput></screen>
    78 
    79     <para>To test the results, issue:</para>
    80 
    81 <screen><userinput remap="test">make check</userinput></screen>
    82 
    83     <para>Install the package:</para>
    84 
    85 <screen><userinput remap="install">make install</userinput></screen>
    86 
    87   </sect2>
    88 
    89   <sect2 id="contents-pkgconfig" role="content">
    90     <title>Contents of Pkg-config</title>
    91 
    92     <segmentedlist>
    93       <segtitle>Installed program</segtitle>
    94       <segtitle>Installed directory</segtitle>
    95 
    96       <seglistitem>
    97         <seg>pkg-config</seg>
    98         <seg>/usr/share/doc/pkg-config-&pkgconfig-version;</seg>
    99       </seglistitem>
    100     </segmentedlist>
    101 
    102     <variablelist>
    103       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    104       <?dbfo list-presentation="list"?>
    105       <?dbhtml list-presentation="table"?>
    106 
    107       <varlistentry id="pkgconfig">
    108          <!-- Don't remove the extra space, it prevents a FOP warning. -->
    109         <term><command>pkg-config </command></term>
    110         <listitem>
    111           <para>returns meta information for the specified library or package.
    112           </para>
    113           <indexterm zone="ch-system-pkgconfig pkgconfig">
    114             <primary sortas="b-pkgconfig">pkg-config</primary>
    115           </indexterm>
    116         </listitem>
    117       </varlistentry>
    118 
    119     </variablelist>
    120 
    121   </sect2>
    122 
    123 </sect1>

  • BOOK/chapter06/pkgconf.xml 

    diff -Naur LFS.orig/BOOK/chapter06/pkgconf.xml LFS/BOOK/chapter06/pkgconf.xml
    old new  
     1<?xml version="1.0" encoding="ISO-8859-1"?>
     2<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
     3  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     4  <!ENTITY % general-entities SYSTEM "../general.ent">
     5  %general-entities;
     6]>
     7
     8<sect1 id="ch-system-pkgconf" role="wrap">
     9  <?dbhtml filename="pkgconf.html"?>
     10
     11  <sect1info condition="script">
     12    <productname>pkgconf</productname>
     13    <productnumber>&pkgconf-version;</productnumber>
     14    <address>&pkgconf-url;</address>
     15  </sect1info>
     16
     17  <title>Pkgconf-&pkgconf-version;</title>
     18
     19  <indexterm zone="ch-system-pkgconf">
     20    <primary sortas="a-pkgconf">Pkgconf</primary>
     21  </indexterm>
     22
     23  <sect2 role="package">
     24    <title/>
     25
     26    <para>The pkgconf package contains a tool for passing the include path
     27    and/or library paths to build tools during the configure and make file
     28    execution.</para>
     29
     30    <segmentedlist>
     31      <segtitle>&buildtime;</segtitle>
     32      <segtitle>&diskspace;</segtitle>
     33
     34      <seglistitem>
     35        <seg>&pkgconf-ch6-sbu;</seg>
     36        <seg>&pkgconf-ch6-du;</seg>
     37      </seglistitem>
     38    </segmentedlist>
     39
     40  </sect2>
     41
     42  <sect2 role="installation">
     43    <title>Installation of Pkgconf</title>
     44
     45    <para>Prepare Pkgconf for compilation:</para>
     46
     47<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
     48
     49    <para>Compile the package:</para>
     50
     51<screen><userinput remap="make">make</userinput></screen>
     52
     53    <para>To test the results, issue:</para>
     54
     55<screen><userinput remap="test">make check</userinput></screen>
     56
     57    <para>Install the package:</para>
     58
     59<screen><userinput remap="install">make install</userinput></screen>
     60
     61    <para>Many applications expect pkg-config so you should install a symlink
     62    for this:</para>
     63
     64<screen><userinput remap="install">ln -sfv pkgconf /usr/bin/pkg-config</userinput></screen>
     65
     66  </sect2>
     67
     68  <sect2 id="contents-pkgconf" role="content">
     69    <title>Contents of Pkgconf</title>
     70
     71    <segmentedlist>
     72      <segtitle>Installed programs</segtitle>
     73
     74      <seglistitem>
     75        <seg>pkgconf and pkg-config (link to pkgconf)</seg>
     76      </seglistitem>
     77    </segmentedlist>
     78
     79    <variablelist>
     80      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     81      <?dbfo list-presentation="list"?>
     82      <?dbhtml list-presentation="table"?>
     83
     84      <varlistentry id="pkgconf">
     85         <!-- Don't remove the extra space, it prevents a FOP warning. -->
     86        <term><command>pkgconf </command></term>
     87        <listitem>
     88          <para>returns meta information for the specified library or package.
     89          </para>
     90          <indexterm zone="ch-system-pkgconf pkgconf">
     91            <primary sortas="b-pkgconf">pkgconf</primary>
     92          </indexterm>
     93        </listitem>
     94      </varlistentry>
     95
     96    </variablelist>
     97
     98  </sect2>
     99
     100</sect1>

  • BOOK/packages.ent 

    diff -Naur LFS.orig/BOOK/packages.ent LFS/BOOK/packages.ent
    old new  
    443443<!ENTITY perl-ch6-du "246 MB">
    444444<!ENTITY perl-ch6-sbu "6.7 SBU">
    445445
    446 <!ENTITY pkgconfig-version "0.28">
    447 <!ENTITY pkgconfig-size "1,892 KB">
    448 <!ENTITY pkgconfig-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
    449 <!ENTITY pkgconfig-md5 "aa3c86e67551adc3ac865160e34a2a0d">
    450 <!ENTITY pkgconfig-home "http://www.freedesktop.org/wiki/Software/pkg-config">
    451 <!ENTITY pkgconfig-ch6-du "31 MB">
    452 <!ENTITY pkgconfig-ch6-sbu "0.4 SBU">
     446<!ENTITY pkgconf-version "0.9.3">
     447<!ENTITY pkgconf-size "81 KB">
     448<!ENTITY pkgconf-url "http://rabbit.dereferenced.org/~nenolod/distfiles/pkgconf-&pkgconf-version;.tar.bz2">
     449<!ENTITY pkgconf-md5 "52c553bad686f8be1556b58bc1925f4f">
     450<!ENTITY pkgconf-home "https://github.com/pkgconf/pkgconf">
     451<!ENTITY pkgconf-ch6-du "1.4 MB">
     452<!ENTITY pkgconf-ch6-sbu "0.1 SBU">
    453453
    454454<!ENTITY procps-ng-version "3.3.8">
    455455<!ENTITY procps-ng-size "544 KB">

  • BOOK/prologue/why.xml 

    diff -Naur LFS.orig/BOOK/prologue/why.xml LFS/BOOK/prologue/why.xml
    old new  
    359359      </listitem>
    360360
    361361      <listitem>
    362         <para>Pkg-config</para>
     362        <para>Pkgconf</para>
    363363
    364364        <para>This package provides a program to return meta-data about an
    365365        installed library or package.</para>