diff options
author | Mark Hymers <markh@linuxfromscratch.org> | 2001-08-15 13:00:49 +0000 |
---|---|---|
committer | Mark Hymers <markh@linuxfromscratch.org> | 2001-08-15 13:00:49 +0000 |
commit | 811364d703b8c5e8526b827e6947298993ce7a30 (patch) | |
tree | 41d764fdd28fbcc1a0ce5c141bd9fdc2d0f65532 /chapter05 | |
parent | 8f5efb62001439e55fbacf47e2b4a9f21b6faa01 (diff) |
replace sed with option to gcc
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@974 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r-- | chapter05/bzip2-exp.xml | 9 | ||||
-rw-r--r-- | chapter05/bzip2-inst.xml | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chapter05/bzip2-exp.xml b/chapter05/bzip2-exp.xml index b53254eab..9c8853566 100644 --- a/chapter05/bzip2-exp.xml +++ b/chapter05/bzip2-exp.xml @@ -1,6 +1,7 @@ <sect2> <title>Command explanations</title> +<!-- <para><userinput>sed: </userinput> The sed command here searches for the string "$(CC) $(CFLAGS) -o" and replaces it by "$(CC) $(CFLAGS) $(LDFLAGS) -o" in the Makefile file. We make that modification so it @@ -23,5 +24,13 @@ link a package statically. This is also the most common way. The -all-static value is only used with the binutils package and won't be used throughout the rest of this book.</para> +I HAVEN'T REMOVED THIS AS WE MAY NEED TO COPY SOME OF IT TO A LATER +PACKAGE. IS THIS THE CASE? + +--> + +<para><userinput>make CC="gcc -static": </userinput>This is the method +we use to tell gcc that we want bzip2 to be linked statically.</para> + </sect2> diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 2c2f04dbc..aa5d87dd8 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -3,9 +3,7 @@ <para>Install Bzip2 by running the following commands:</para> -<para><screen><userinput>sed \</userinput> -<userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput> -<userinput> Makefile | make -f - LDFLAGS=-static &&</userinput> +<para><screen><userinput>make CC="gcc -static" &&</userinput> <userinput>make PREFIX=$LFS/usr install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> <userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para> |