diff options
| author | Krejzi <krejzi@linuxfromscratch.org> | 2014-02-15 00:40:11 +0000 |
|---|---|---|
| committer | Krejzi <krejzi@linuxfromscratch.org> | 2014-02-15 00:40:11 +0000 |
| commit | f8756ab90bb3d7c3f4010c0d19a0624c330f889b (patch) | |
| tree | 9529ec03e2c022afde268385d20428655c36ed7d /chapter05 | |
| parent | e88c73c0575311238614cf05e8b54c69a9a7a4e8 (diff) | |
Merge latest LFS SVN.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10468 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
| -rw-r--r-- | chapter05/expect.xml | 4 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 6 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 8 | ||||
| -rw-r--r-- | chapter05/util-linux.xml | 6 |
4 files changed, 10 insertions, 14 deletions
diff --git a/chapter05/expect.xml b/chapter05/expect.xml index e1a9d9dbc..d53394504 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -121,7 +121,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig > configure</userinput></screen> <seglistitem> <seg>expect</seg> - <seg>libexpect-&expect-lib-version;.a</seg> + <seg>libexpect-&expect-lib-version;.so</seg> </seglistitem> </segmentedlist> @@ -142,7 +142,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig > configure</userinput></screen> </varlistentry> <varlistentry id="libexpect"> - <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term> + <term><filename class="libraryfile">libexpect-&expect-lib-version;.so</filename></term> <listitem> <para>Contains functions that allow Expect to be used as a Tcl extension or to be used directly from C or C++ (without Tcl)</para> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 310abb457..e96c469ad 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -64,9 +64,9 @@ that is exactly the same as if it were bootstrapped. Apply the following <command>sed</command> command to force the build to use the flag:</para> -<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.tmp} -sed 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ - > gcc/Makefile.in</userinput></screen> +<screen><userinput remap="pre">case `uname -m` in + i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;; +esac</userinput></screen> <para>Once again, change the location of GCC's default dynamic linker to use the one installed in <filename diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 2fa9ccad8..b7df04edf 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -52,14 +52,6 @@ su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc' fi</userinput></screen> - <para>An upstream change needs to be reverted:</para> - -<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen> - - <para>Allow Glibc to be built using Make-&make-version;:</para> - -<screen><userinput remap="pre">sed -r -i 's/(3..89..)/\1 | 4.*/' configure</userinput></screen> - <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 7156895c2..909fa6679 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -73,7 +73,11 @@ <term><envar>PKG_CONFIG=""</envar></term> <listitem> <para>Setting this envronment variable prevents adding unneeded - features that may be available on the host.</para> + features that may be available on the host. Note that the location + shown for setting this environment variable is different from other + LFS sections where variables are set preceeding the command. This + location is shown to demonstrate an alternative way of setting an + environment variable when using configure.</para> </listitem> </varlistentry> </variablelist> |