[blfs-book] r9621 - in trunk/BOOK: general/genlib multimedia/libdriv postlfs/security server/major

[andy]

Author: andy
Date: 2012-03-06 09:54:55 -0700 (Tue, 06 Mar 2012)
New Revision: 9621

Modified:
   trunk/BOOK/general/genlib/nspr.xml
   trunk/BOOK/multimedia/libdriv/liba52.xml
   trunk/BOOK/postlfs/security/nss.xml
   trunk/BOOK/server/major/bind.xml
Log:
s/arch/uname -m/

Modified: trunk/BOOK/general/genlib/nspr.xml
===================================================================
--- trunk/BOOK/general/genlib/nspr.xml  2012-03-06 16:19:54 UTC (rev 9620)
+++ trunk/BOOK/general/genlib/nspr.xml  2012-03-06 16:54:55 UTC (rev 9621)
@@ -88,7 +88,7 @@
 sed -i 's#^\(RELEASE_BINS =\).*#\1#' pr/src/misc/Makefile.in &&
 sed -i 's#$(LIBRARY) ##' config/rules.mk &&
 ./configure --prefix=/usr --with-mozilla --with-pthreads \
-  $([ $(arch) = x86_64 ] && echo --enable-64bit) &&
+  $([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
 make</userinput></screen>
 
     <para>
@@ -130,7 +130,7 @@
     </para>
 
     <para>
-      <parameter>$([ $(arch) ... --enable-64bit</parameter>: This parameter is
+      <parameter>$([ $(uname -m) ... --enable-64bit</parameter>: This 
parameter is
       required <emphasis>on an x86_64 system</emphasis> to prevent
       <command>configure</command> failing with a claim that this is a system
       without pthread support. It has no effect on a 32 bit system.

Modified: trunk/BOOK/multimedia/libdriv/liba52.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/liba52.xml    2012-03-06 16:19:54 UTC (rev 
9620)
+++ trunk/BOOK/multimedia/libdriv/liba52.xml    2012-03-06 16:54:55 UTC (rev 
9621)
@@ -73,7 +73,7 @@
     following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr --enable-shared --disable-static \
-  CFLAGS="-g -O2 $([ $(arch) = x86_64 ] &amp;&amp; echo -fPIC)" &amp;&amp;
+  CFLAGS="-g -O2 $([ $(uname -m) = x86_64 ] &amp;&amp; echo -fPIC)" &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>

Modified: trunk/BOOK/postlfs/security/nss.xml
===================================================================
--- trunk/BOOK/postlfs/security/nss.xml 2012-03-06 16:19:54 UTC (rev 9620)
+++ trunk/BOOK/postlfs/security/nss.xml 2012-03-06 16:54:55 UTC (rev 9621)
@@ -115,7 +115,7 @@
 
 <screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch 
&amp;&amp;
 cd mozilla/security/nss &amp;&amp;
-make nss_build_all $([ $(arch) = x86_64 ] &amp;&amp; echo USE_64=1) 
BUILD_OPT=1 \
+make nss_build_all $([ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1) 
BUILD_OPT=1 \
   NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
   $(cat /usr/include/sqlite3.h &amp;&gt; /dev/null &amp;&amp; echo 
NSS_USE_SYSTEM_SQLITE=1)</userinput></screen>
 
@@ -173,7 +173,7 @@
     <title>Command Explanations</title>
 
     <para>
-      <parameter>[ $(arch) = x86_64 ] &amp;&amp; echo USE_64=1</parameter>:
+      <parameter>[ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1</parameter>:
       This option is <emphasis>required on x86_64</emphasis>, otherwise the
       <command>make</command> will attempt to create 32-bit objects and in a
       non-multilib system it will fail. The [ $(arch) = x86_64 ] test ensures 
it

Modified: trunk/BOOK/server/major/bind.xml
===================================================================
--- trunk/BOOK/server/major/bind.xml    2012-03-06 16:19:54 UTC (rev 9620)
+++ trunk/BOOK/server/major/bind.xml    2012-03-06 16:54:55 UTC (rev 9621)
@@ -242,7 +242,7 @@
 cp /etc/localtime etc &amp;&amp;
 touch /srv/named/managed-keys.bind &amp;&amp;
 cp /usr/lib/engines/libgost.so usr/lib/engines &amp;&amp;
-[ $(arch) = x86_64 ] &amp;&amp; ln -sv lib usr/lib64</userinput></screen>
+[ $(uname -m) = x86_64 ] &amp;&amp; ln -sv lib usr/lib64</userinput></screen>
 
       <para>The <filename>rndc.conf</filename> file contains information for
       controlling <command>named</command> operations with the

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page