Ticket #5274: pkgconf-multilib.patch

File pkgconf-multilib.patch, 2.3 KB (added by rahul, 17 months ago)

Updated to prevent conflicts

  • chapter08/pkgconf.xml

    diff --color -Naur --exclude .git lfs-test/chapter08/pkgconf.xml lfs-test-multilib/chapter08/pkgconf.xml
    old new  
    6868
    6969  </sect2>
    7070
     71    <!--Multilib additions-->
     72   <sect2 arch="ml_32,ml_all" role="installation">
     73     <title>Multilib Additions</title>
     74   <para>Create a new symlink so that programs can find the 32 Bit librarieses</para>
     75   <screen><userinput remap="install">ln -sfv pkgconf /usr/bin/i686-pc-linux-gnu-pkg-config</userinput></screen>
     76   <para>Create 2 new 'personality' files to let programs know where to find the respective .pc files</para>
     77   <screen><userinput remap="install">cat &gt; /usr/share/pkgconfig/personality.d/i686-pc-linux-gnu.personality &lt;&lt; "EOF"
     78<literal>Triplet: i686-pc-linux-gnu
     79SysrootDir: /
     80DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig
     81SystemIncludePaths: /usr/include
     82SystemLibraryPaths: /usr/lib32</literal>
     83EOF
     84    </userinput></screen>
     85<para>Create One for x86_64 as well so that programs know which one to default too</para>
     86   <screen><userinput remap="install">cat &gt; /usr/share/pkgconfig/personality.d/x86_64-pc-linux-gnu.personality &lt;&lt; "EOF"
     87<literal>Triplet: x86_64-pc-linux-gnu
     88SysrootDir: /
     89DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig
     90SystemIncludePaths: /usr/include
     91SystemLibraryPaths: /usr/lib</literal>
     92EOF
     93    </userinput></screen>
     94  </sect2>
    7195  <sect2 id="contents-pkgconf" role="content">
    7296    <title>Contents of Pkgconf</title>
    7397
     
    112136          </indexterm>
    113137        </listitem>
    114138      </varlistentry>
     139
     140      <varlistentry id="i686-pc-pkg-config ">
     141         <!-- Don't remove the extra space, it prevents a FOP warning. -->
     142        <term><command>i686-pc-pkg-config </command></term>
     143        <listitem>
     144          <para>A pkg-config command that gets the lib32 flags for packages
     145          </para>
     146          <indexterm zone="ch-system-pkgconf i686-pc-pkg-config">
     147            <primary sortas="b-i686-pc-pkg-config">pkg-config</primary>
     148          </indexterm>
     149        </listitem>
     150      </varlistentry>
    115151
    116152      <varlistentry id="bomtool">
    117153         <!-- Don't remove the extra space, it prevents a FOP warning. -->