Changeset df44c72

Timestamp:

Jan 21, 2014, 7:07:47 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

090632e

Parents:

5847541

Message:

Tidy up systemd multilib instructions to be proper in each 32bit, n32, and 64bit build.

Location:

BOOK/final-system/multilib

Files:

• systemd-64bit.xml (modified) (1 diff)
• systemd-n32.xml (modified) (2 diffs)
• systemd.xml (modified) (2 diffs)

BOOK/final-system/multilib/systemd-64bit.xml

@@ -27 +27 @@
 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
   ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" -with-rootlibdir=/lib \
+    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" -with-rootlibdir=/lib64 \
     --enable-split-usr --disable-gudev</userinput></screen>
 

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

@@ -32 +32 @@
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
   ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
+    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
     --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
     --with-rootprefix="" -with-rootlibdir=/lib32 \
@@ -38 +38 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>

BOOK/final-system/multilib/systemd.xml

@@ -46 +46 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make pam_systemd.la</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -52 +54 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make install-pamlibLTLIBRARIES</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>