aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pieere@linuxfromscratch.org>2020-05-06 13:04:34 +0000
committerPierre Labastie <pieere@linuxfromscratch.org>2020-05-06 13:04:34 +0000
commitc911069f9a951e8f378f6b50d1b4f92fe168f114 (patch)
treebc5209cd5b23daa168680494b44aec35a7a4f9db
parentb454589fa6e9dcb0c386d9f84f6d181884230c62 (diff)
Move bison and flex to chroot, they do not need themselves for being built
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11838 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/bison.xml4
-rw-r--r--chapter05/chapter05.xml4
-rw-r--r--chapter05/flex.xml14
3 files changed, 9 insertions, 13 deletions
diff --git a/chapter05/bison.xml b/chapter05/bison.xml
index e6ed2a7f8..3ed86713a 100644
--- a/chapter05/bison.xml
+++ b/chapter05/bison.xml
@@ -46,8 +46,6 @@
<para>Prepare Bison for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
- --build=$(build-aux/config.guess) \
- --host=$LFS_TGT \
--docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
<variablelist>
@@ -69,7 +67,7 @@
<para>Install the package:</para>
-<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
</sect2>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 771ba53cc..e12bba837 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -22,8 +22,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
@@ -46,6 +44,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index 5761e82e5..88e263413 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -46,36 +46,34 @@
<para>Prepare Flex for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
- --host=$LFS_TGT \
- --build=$(build-aux/config.guess) \
- --disable-bootstrap \
--docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+ <!--
<variablelist>
<title>The meaning of the new configure option:</title>
<varlistentry>
- <term><parameter>--disable-bootstrap</parameter></term>
+ <term><parameter>- -disable-bootstrap</parameter></term>
<listitem>
<para>Normally, building flex is done in two stages. A first
programs, which is used to generate the source of a second one,
which is then compiled. When using cross-compilation, the first
- program is generated on the build systemd. However, due to a bug
- in configure, the presence of some funciton is tested only on the
+ program is generated on the build system. However, due to a bug
+ in configure, the presence of some function is tested only on the
host system. If this function is not found on the build system, the
build fails. This can be prevented by disabling the two stage
build.</para>
</listitem>
</varlistentry>
</variablelist>
-
+ -->
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>
<para>Install the package:</para>
-<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
</sect2>