Changeset 14922bb for BOOK

Timestamp:

Apr 11, 2014, 9:18:17 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

8fdd4fb

Parents:

21c0d19

Message:

Disable installation of grub-mkfont

Location:

BOOK

Files:

• boot/64/grub-build.xml (modified) (1 diff)
• boot/multilib/grub-build.xml (modified) (1 diff)
• boot/x86/grub-build.xml (modified) (1 diff)
• introduction/x86/changelog.xml (modified) (1 diff)

BOOK/boot/64/grub-build.xml

@@ -41 +41 @@
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
+    --sysconfdir=/etc --disable-werror --enable-grub-mkfont=no</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/multilib/grub-build.xml

@@ -41 +41 @@
 <screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror</userinput></screen>
+    --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror \
+    --enable-grub-mkfont=no</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/grub-build.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/x86/grub-build.xml

@@ -41 +41 @@
 <screen os="ab"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --sysconfdir=/etc --disable-werror</userinput></screen>
+    --sysconfdir=/etc --disable-werror --enable-grub-mkfont=no</userinput></screen>
+
+<para os="b">The meaning of the new configure option:</para>
+
+  <variablelist os="bc">
+    <varlistentry>
+      <term><parameter>--enable-grub-mkfont=no</parameter></term>
+      <listitem><para>Prevents GRUB from trying to build
+      <command>grub-mkfont</command>, which requires Freetype.</para></listitem>
+    </varlistentry>
+
+  </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/introduction/x86/changelog.xml

@@ -33 +33 @@
 -->
     <listitem>
+      <para>11 April 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Prevent GRUB from trying to build mkfont, to avoid
+          linking to host system libraries.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>24 October 2013</para>
       <itemizedlist>