[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 110e1fa9348f0853312e3559d527e4f52a3d9f17

[git]

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  110e1fa9348f0853312e3559d527e4f52a3d9f17 (commit)
      from  06fcd8eba18cd3118f935995f052ce8522c574ad (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 110e1fa9348f0853312e3559d527e4f52a3d9f17
Author: Joe Ciccone <jciccone at gmail.com>
Date:   Tue Aug 3 21:42:23 2010 -0400

    Simplify and Fix the linking of Readline to NCurses.

diff --git a/BOOK/final-system/common/readline.xml b/BOOK/final-system/common/readline.xml
index 8f22505..806878c 100644
--- a/BOOK/final-system/common/readline.xml
+++ b/BOOK/final-system/common/readline.xml
@@ -30,18 +30,13 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&readline-branch_update-patch;</userinput></screen>
 
-    <para os="s1">This option forces Readline to link against the
-          <filename class="libraryfile">libncursesw</filename> library:</para>
-
-<screen os="s2"><userinput>sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncursesw:' support/shobj-conf</userinput></screen>
-
     <para os="a">Prepare Readline for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
     <para os="c">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make SHLIB_LIBS=-lncurses</userinput></screen>
 
     <para os="e">This package does not come with a test suite.</para>
 
diff --git a/BOOK/final-system/multilib/readline-64bit.xml b/BOOK/final-system/multilib/readline-64bit.xml
index ea46a46..5af02ee 100644
--- a/BOOK/final-system/multilib/readline-64bit.xml
+++ b/BOOK/final-system/multilib/readline-64bit.xml
@@ -31,14 +31,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
diff --git a/BOOK/final-system/multilib/readline-n32.xml b/BOOK/final-system/multilib/readline-n32.xml
index 7976546..50bc05c 100644
--- a/BOOK/final-system/multilib/readline-n32.xml
+++ b/BOOK/final-system/multilib/readline-n32.xml
@@ -32,14 +32,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
diff --git a/BOOK/final-system/multilib/readline.xml b/BOOK/final-system/multilib/readline.xml
index 1014019..f509663 100644
--- a/BOOK/final-system/multilib/readline.xml
+++ b/BOOK/final-system/multilib/readline.xml
@@ -32,14 +32,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/readline.xml         |    7 +------
 BOOK/final-system/multilib/readline-64bit.xml |    8 --------
 BOOK/final-system/multilib/readline-n32.xml   |    8 --------
 BOOK/final-system/multilib/readline.xml       |    8 --------
 4 files changed, 1 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book