Changeset 2b224753 for BOOK/final-system/multilib

Timestamp:

Oct 3, 2006, 1:13:56 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

0c318f1

Parents:

3d95ac44

Message:

Update the udev libvolume_id instructions

Location:

BOOK/final-system/multilib

Files:

• udev-n32.xml (modified) (1 diff)
• udev.xml (modified) (1 diff)

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

@@ -22 +22 @@
     <title>Installation of Udev</title>
 
-
-    <para os="p1">This patch moves /lib/udev to /lib64/udev, to keep
-    system consistency:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&udev-lib64-patch;</userinput></screen>
-
-    <para os="s1">This sed will move the build directory from lib64 to lib32, so we
-    can build the library with the correct information:</para>
-
-<screen os="s2"><userinput>sed -i 's@lib64@lib32@g' extras/volume_id/lib/Makefile</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
+    href="udev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILDN32}" LD="gcc ${BUILDN32}" \
- EXTRAS="extras/volume_id"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="b"><userinput>cd extras/volume_id/lib
+make CC="gcc ${BUILDN32}" AR=ar RANLIB=ranlib E=@echo Q=@</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="udev.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="m2"><userinput>cp -arv extras/volume_id/lib/libvolume_id.so* /usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="udev.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-<screen os="m4"><userinput>install -dv /usr/lib32/pkgconfig
-cp -arv extras/volume_id/lib/libvolume_id.pc /usr/lib32/pkgconfig</userinput></screen>
+<screen os="d"><userinput>make libdir=/lib32 usrlibdir=/usr/lib32 install</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/udev.xml

@@ -22 +22 @@
     <title>Installation of Udev</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    <para os="a">Udev only provides one library, libvolume_id. Instead of
+    building the entire udev package for one library, We're just going to
+    compile the single library:</para>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD32}" LD="gcc ${BUILD32}" \
- EXTRAS="extras/volume_id"</userinput></screen>
+<screen os="b"><userinput>cd extras/volume_id/lib
+make CC="gcc ${BUILD32}" AR=ar RANLIB=ranlib E=@echo Q=@</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    <para os="c">Install the library:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Now we copy the library files over to our proper location:</para>
-
-<screen os="m2"><userinput>cp -arv extras/volume_id/lib/libvolume_id.so* /usr/lib</userinput></screen>
-
-    <para os="m3">Now we copy the pkgconfig data file over, this file will be used in builds
-    after CLFS:</para>
-
-<screen os="m4"><userinput>install -dv /usr/lib/pkgconfig
-cp -arv extras/volume_id/lib/libvolume_id.pc /usr/lib/pkgconfig</userinput></screen>
+<screen os="d"><userinput>make install</userinput></screen>
 
   </sect2>