Revision: 4385
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4385&view=rev
Author: atkac
Date: 2011-04-27 11:28:56 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
Merged r4377 from 1_1 branch.
Modified Paths:
--------------
trunk/BUILDING.txt
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1_1:4340,4342-4359,4361
/branches/unified_buildsys:3892-3898
+ /branches/1_1:4340,4342-4359,4361,4377
/branches/unified_buildsys:3892-3898
Modified: trunk/BUILDING.txt
===================================================================
--- trunk/BUILDING.txt 2011-04-27 11:28:09 UTC (rev 4384)
+++ trunk/BUILDING.txt 2011-04-27 11:28:56 UTC (rev 4385)
@@ -12,21 +12,25 @@
-- libtool 1.4 or later
-- 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
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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits