Changeset 27178ae for BOOK/final-system/multilib/zlib-n32.xml

Timestamp:

Feb 21, 2006, 2:06:53 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

bcbd90b

Parents:

f013de9

Message:

r1041@server (orig r1039): jim | 2006-01-11 17:12:52 -0800

r1346@server: jim | 2006-01-11 17:10:51 -0800
Updated zlib to build shared and static at the same time. Recommendation by Tushar Teredesai

File:

• BOOK/final-system/multilib/zlib-n32.xml (modified) (2 diffs)

BOOK/final-system/multilib/zlib-n32.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
-<screen os="c"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
-   --shared --libdir=/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="zlib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
+   --shared --libdir=/usr/lib32</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -50 +58 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    <para os="h">The previous command installed a <filename
+    class="extension">.so</filename> file in <filename
+    class="directory">/usr/lib32</filename>. We will remove itinto
+    <filename class="directory">/lib32</filename> and then relink it
+    to <filename class="directory">/usr/lib32</filename>:</para>
 
-    <para os="i">The previous command installed a <filename
-    class="extension">.so</filename> file in <filename
-    class="directory">/lib32</filename>. We will remove it and relink it into
-    <filename class="directory">/usr/lib32</filename>:</para>
-
-<screen os="j"><userinput>rm /lib32/libz.so
-ln -sf ../../lib32/libz.so.&zlib-version; /usr/lib32/libz.so</userinput></screen>
+<screen os="i"><userinput>mv /usr/lib32/libz.so.*
+ln -sf ../../lib32/libz.so.1 /usr/lib32/libz.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="l"><userinput>make clean
-CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
-    --prefix=/usr --libdir=/usr/lib32
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-<screen os="q"><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
+<screen os="k"><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
 
   </sect2>