[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 01672b830d95c49053dce3f98074e1897ef27efc
git
git at cross-lfs.org
Mon Nov 12 13:25:58 PST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 01672b830d95c49053dce3f98074e1897ef27efc (commit)
from 575933262cf90828a3b4dabb2da73ebaff40925e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 01672b830d95c49053dce3f98074e1897ef27efc
Author: Chris Staub <chris at beaker67.com>
Date: Mon Nov 12 16:25:42 2012 -0500
Do not use sed -i in temp-system as the host cannot be guaranteed to have GNU sed
diff --git a/BOOK/boot/64/shadow.xml b/BOOK/boot/64/shadow.xml
index feb7276..b67bf50 100644
--- a/BOOK/boot/64/shadow.xml
+++ b/BOOK/boot/64/shadow.xml
@@ -23,11 +23,10 @@
<title>Installation of Shadow</title>
<para os="b">Disable the installation of the <command>groups</command>
- program and its man pages, as Coreutils provides a better version:</para>
+ program, as Coreutils provides a better version:</para>
-<screen os="c"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-find man -name Makefile.in -exec sed -i '/groups\.1\.xml/d' '{}' \;
-find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
+<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
+sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
<para os="t1">The following cache entries set the values for tests that do
not run while cross-compiling:</para>
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index c4c5941..9b823fe 100644
--- a/BOOK/boot/common/shadow.xml
+++ b/BOOK/boot/common/shadow.xml
@@ -23,11 +23,10 @@
<title>Installation of Shadow</title>
<para os="b">Disable the installation of the <command>groups</command>
- program and its man pages, as Coreutils provides a better version:</para>
+ program, as Coreutils provides a better version:</para>
-<screen os="c"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-find man -name Makefile.in -exec sed -i '/groups\.1\.xml/d' '{}' \;
-find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
+<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
+sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
<para os="t1">The following cache entries set the values for tests that do
not run while cross-compiling:</para>
diff --git a/BOOK/boot/multilib/shadow.xml b/BOOK/boot/multilib/shadow.xml
index feb7276..b67bf50 100644
--- a/BOOK/boot/multilib/shadow.xml
+++ b/BOOK/boot/multilib/shadow.xml
@@ -23,11 +23,10 @@
<title>Installation of Shadow</title>
<para os="b">Disable the installation of the <command>groups</command>
- program and its man pages, as Coreutils provides a better version:</para>
+ program, as Coreutils provides a better version:</para>
-<screen os="c"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-find man -name Makefile.in -exec sed -i '/groups\.1\.xml/d' '{}' \;
-find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
+<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
+sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
<para os="t1">The following cache entries set the values for tests that do
not run while cross-compiling:</para>
diff --git a/BOOK/temp-system/common/coreutils.xml b/BOOK/temp-system/common/coreutils.xml
index 0067571..fc17d26 100644
--- a/BOOK/temp-system/common/coreutils.xml
+++ b/BOOK/temp-system/common/coreutils.xml
@@ -47,7 +47,8 @@ EOF</userinput></screen>
<!--- Hack for coreutils to build for target executables which can't be ran with the host. -->
<para os="h1">Coreutils does not build make-prime-list properly and the host cannot execute it. We build it using the host compiler so it can be executed for the generation of data required for the build.</para>
-<screen os="h2"><userinput>sed '/src_make_prime_list/d' -i Makefile
+<screen os="h2"><userinput>cp -v Makefile{,.orig}
+sed '/src_make_prime_list/d' Makefile.orig > Makefile
depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
gcc -std=gnu99 -I. -I./lib -Ilib -I./lib -Isrc -I./src \
-fdiagnostics-show-option -funit-at-a-time -g -O2 -MT \
@@ -60,7 +61,8 @@ gcc -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 \
<para os="h3">Remove the building of the hostname man page as it is affected by the previous commands.</para>
-<screen os="h4"><userinput>sed -i '/hostname.1/d' -i Makefile</userinput></screen>
+<screen os="h4"><userinput>cp -v Makefile{,.bak}
+sed -e '/hostname.1/d' Makefile.bak > Makefile</userinput></screen>
<!-- End hack -->
<para os="bf">Compile the package:</para>
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index 571cacf..2fdc133 100644
--- a/BOOK/temp-system/common/vim.xml
+++ b/BOOK/temp-system/common/vim.xml
@@ -34,7 +34,8 @@
cannot be bypassed with a cache entry. Disable this test with the
following command:</para>
-<screen os="s2"><userinput>sed -i "/using uint32_t/s/as_fn_error/#&/" src/auto/configure</userinput></screen>
+<screen os="s2"><userinput>cp -v src/auto/configure{,.orig}
+sed "/using uint32_t/s/as_fn_error/#&/" src/auto/configure.orig > src/auto/configure</userinput></screen>
<para os="c1">The <command>configure</command> script is full of logic
that aborts at the first sign of cross compiling. Work around this by
diff --git a/BOOK/temp-system/multilib/coreutils.xml b/BOOK/temp-system/multilib/coreutils.xml
index f19c7d3..ace5d08 100644
--- a/BOOK/temp-system/multilib/coreutils.xml
+++ b/BOOK/temp-system/multilib/coreutils.xml
@@ -52,7 +52,8 @@
href="../common/coreutils.xml"
xpointer="xpointer(//*[@os='h1'])"/>
-<screen os="h2"><userinput>sed '/src_make_prime_list/d' -i Makefile
+<screen os="h2"><userinput>cp -v Makefile{,.orig}
+sed '/src_make_prime_list/d' Makefile.orig > Makefile
depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
gcc -m64 -std=gnu99 -I. -I./lib -Ilib -I./lib -Isrc -I./src \
-fdiagnostics-show-option -funit-at-a-time -g -O2 -MT \
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/shadow.xml | 7 +++----
BOOK/boot/common/shadow.xml | 7 +++----
BOOK/boot/multilib/shadow.xml | 7 +++----
BOOK/temp-system/common/coreutils.xml | 6 ++++--
BOOK/temp-system/common/vim.xml | 3 ++-
BOOK/temp-system/multilib/coreutils.xml | 3 ++-
6 files changed, 17 insertions(+), 16 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list