diff options
author | Douglas R. Reno <renodr@linuxfromscratch.org> | 2017-05-25 21:42:42 +0000 |
---|---|---|
committer | Douglas R. Reno <renodr@linuxfromscratch.org> | 2017-05-25 21:42:42 +0000 |
commit | 9e326ab2d78d22161373ecbeb87b6256d3442e18 (patch) | |
tree | e1d4ad0640cb57bd40d0017ea799fbbcdf7b96f3 | |
parent | 00abb8f1501e00263aba78e959e2a84471c15aea (diff) |
Fix the build of gcc/glibc for i686 systems
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11254 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r-- | chapter01/changelog.xml | 10 | ||||
-rw-r--r-- | chapter06/glibc.xml | 2 | ||||
-rw-r--r-- | general.ent | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8e1932c51..4ce8ca8a5 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,16 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2017-05-25</para> + <itemizedlist> + <listitem> + <para>[renodr] - Fix the build for i686 systems. Includes a + modification to Chapter 06 Glibc.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2017-05-19</para> <itemizedlist> <listitem> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index cdcdf2e47..5ef90aaeb 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -67,7 +67,7 @@ required for the dynamic loader to function correctly:</para> <screen><userinput remap="pre">case $(uname -m) in - x86) GCC_INCDIR=/usr/lib/gcc/x86-pc-linux-gnu/&gcc-version;/include + i?86) GCC_INCDIR=/usr/lib/gcc/$(uname -m)-pc-linux-gnu/&gcc-version;/include ln -s ld-linux.so.2 /lib/ld-lsb.so.3 ;; x86_64) GCC_INCDIR=/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include diff --git a/general.ent b/general.ent index 6719c684c..fd187d26a 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20170518"> +<!ENTITY version "SVN-20170525"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20170518-systemd"> +<!ENTITY versiond "20170525-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "May 18, 2017"> +<!ENTITY releasedate "May 25, 2017"> <!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "8.1"> |