From: DRC <dcommander@users.sourceforge.net>
Date: Sat, 16 Apr 2011 13:26:36 +0000 (+0000)
Subject: Update build instructions to reflect the fact that 32-bit LJT build doesn't work... 
X-Git-Tag: 1.1.1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58454c74ccf044c6899700baf231de60b163f4a0;p=libjpeg-turbo

Update build instructions to reflect the fact that 32-bit LJT build doesn't work with NASM 0.99 or 2.00


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@578 632fc199-4ca6-4c93-a231-07263d6284db
---

58454c74ccf044c6899700baf231de60b163f4a0
diff --cc BUILDING.txt
index 50e2fb7,9779909..846e969
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@@ -10,23 -9,28 +10,27 @@@ Build Requirement
  -- autoconf 2.56 or later
  -- automake 1.7 or later
  -- libtool 1.4 or later
 -   * If using MinGW, these can be obtained by installing the MSYS DTK
  
  -- NASM
-    * 0.98 or later is required for a 32-bit build
-    * NASM 2.05 or later is required for a 64-bit build
+    * 0.98, or 2.01 or later is required for a 32-bit build
+    * NASM 2.00 or later is required for a 64-bit build
 -   * NASM 2.07 or later is required for a 64-bit build on OS/X.  This can be
 +   * NASM 2.07 or later is required for a 64-bit build on OS X.  This can be
       obtained from MacPorts (http://www.macports.org/).
  
-    The NASM 2.05 RPMs do not work on older Linux systems, such as Red Hat
-    Enterprise Linux 4.  On such systems, you can easily build and install NASM
-    2.05 from the source RPM by executing the following as root:
+    The binary RPMs released by the NASM project do not work on older Linux
+    systems, such as Red Hat Enterprise Linux 4.  On such systems, you can
+    easily build and install NASM from a source RPM by downloading one of the
+    SRPMs from
+ 
+    http://www.nasm.us/pub/nasm/releasebuilds
+ 
+    and executing the following as root:
  
       ARCH=`uname -m`
-      wget http://www.nasm.us/pub/nasm/releasebuilds/2.05.01/nasm-2.05.01-1.src.rpm
-      rpmbuild --rebuild nasm-2.05.01-1.src.rpm
-      rpm -Uvh /usr/src/redhat/RPMS/$ARCH/nasm-2.05.01-1.$ARCH.rpm
+      rpmbuild --rebuild nasm-{version}.src.rpm
+      rpm -Uvh /usr/src/redhat/RPMS/$ARCH/nasm-{version}.$ARCH.rpm
  
-    NOTE: NASM build will fail if texinfo is not installed.
+    NOTE: the NASM build will fail if texinfo is not installed.
  
  -- GCC v4.1 or later recommended for best performance