[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-16-g79a8c8e

[Robin Cornelius]

The following commit has been merged in the master branch:
commit b74cfab6c48937b17012ddd7f0b070f2b740703e
Merge: b37efee7284f723e634150a0f59bcd785ebd869c 03d41ac184c99f784e58d16fbec9c5ece6080cbe
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Mon Jun 9 19:40:53 2008 +0100

    Merge branch 'upstream'

diff --combined indra/SConstruct
index bfc30aa,9353317..af14c93
--- a/indra/SConstruct
+++ b/indra/SConstruct
@@@ -163,9 -163,6 +163,9 @@@ standalone_net_pkgs = 
      'libssl',
      ]
  
 +if enable_gstreamer:
 +    standalone_pkgs.append( 'gstreamer-0.10' )
 +
  def pkgconfig(opt, pkgs=None):
      if pkgs is None:
          pkgs = standalone_pkgs + standalone_net_pkgs
@@@ -180,8 -177,6 +180,8 @@@ if standalone
                                'packages: %s' % ' '.join(missing))
          sys.exit(2)
  
 +
 +
  #####################
  # ITERATE TARGETS   #
  #####################
@@@ -213,7 -208,7 +213,7 @@@ for build_target in targets
      try:
          build_dir_prefix = os.environ['TEMP_BUILD_DIR']
      except:
 -        build_dir_prefix = '/tmp/' + os.environ['USER']
 +        build_dir_prefix = '/tmp/'
          
      build_dir = build_dir_prefix + os.getcwd() + '/' + system_str + '-' + build_target + '-' + buildtype
  
@@@ -354,7 -349,7 +354,7 @@@
          strip_cmd = '/opt/crosstool/gcc-4.0.2-glibc-2.3.6/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/bin/strip -S -o $TARGET $SOURCE'
  
      else:
-         gcc_bin = 'g++-3.4'
+         gcc_bin = 'g++-4.1'
  
      # Are we using the Intel compiler?
      if gcc_bin.find('icpc') >= 0:
@@@ -375,8 -370,8 +375,8 @@@
      releasenoopt_cflags = cflags + '-O0 '
      releasenoopt_cxxflags = cxxflags + '-O0 '
      releasenoopt_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
-     releasefordownload_cflags = cflags + '-O2 '
-     releasefordownload_cxxflags = cxxflags + '-O2 '
+     releasefordownload_cflags = cflags + '-O2 -fno-stack-protector '
+     releasefordownload_cxxflags = cxxflags + '-O2 -fno-stack-protector '
      releasefordownload_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
  
      ################
@@@ -481,6 -476,7 +481,7 @@@
          env['ENV']['DISTCC_HOSTS'] = hosts
          env['ENV']['USER'] = os.environ['USER']
          env['ENV']['HOME'] = os.environ['HOME']
+         #env['ENV']['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']
  
      if enable_colorgcc:
          env['ENV']['PATH'] = os.environ['PATH']

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids