[Clfs-commits] commit: r4718 - in /trunk: BOOK/final-system/multilib/bzip2-64bit.xml BOOK/introduction/common/changelog.xml scripts/patch/perl-patch.sh

[svn at cross-lfs.org]

Author: jim
Date: Thu Feb 19 04:42:56 2009
New Revision: 4718

Log:
Bzip2 Multilib Update

Modified:
    trunk/BOOK/final-system/multilib/bzip2-64bit.xml
    trunk/BOOK/introduction/common/changelog.xml
    trunk/scripts/patch/perl-patch.sh

Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml Thu Feb 19 04:42:56 2009
@@ -55,9 +55,7 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+<screen os="h"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" PREFIX=/usr install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Thu Feb 19 04:42:56 2009
@@ -35,6 +35,16 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>February 18, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jim] - Updated Bzip2 Multilib 64bit install. On some occasions the make command
+          during an install will rebuild sources. Lets make sure it uses our specified options.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>February 17, 2009</para>

Modified: trunk/scripts/patch/perl-patch.sh
==============================================================================
--- trunk/scripts/patch/perl-patch.sh (original)
+++ trunk/scripts/patch/perl-patch.sh Thu Feb 19 04:42:56 2009
@@ -20,6 +20,14 @@
   wget http://www.cpan.org/src/perl-${VERSION}.tar.gz
 fi
 
+# Set Patch Number
+#
+cd /usr/src
+wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
+PATCH_NUM=$(cat index.html | grep perl | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
+PATCH_NUM=$(expr ${PATCH_NUM} + 1)
+rm -f index.html
+
 # Cleanup Directory
 #
 rm -rf perl-${VERSION} perl-${VERSION}.orig
@@ -27,13 +35,12 @@
 mv perl-${VERSION} perl-${VERSION}.orig
 CURRENTDIR=$(pwd -P)
 
-# Get Current Updates from CVS
+# Get Current Updates from GIT
 #
 cd /usr/src
-FIXEDVERSION=$(echo ${VERSION} | sed -e 's ..$  ')
-rsync -avz rsync://perl5.git.perl.org/APC/perl-${FIXEDVERSION}.x tmp
-cd tmp
-mv perl-${FIXEDVERSION}.x /usr/src/perl-${VERSION}
+mkdir perl.git
+cd perl.git
+git clone git://perl5.git.perl.org/perl.git
 
 # Cleanup
 #