secondlife-standalone-maint-svn/ignore_prebuilt_install_error.patch

   1 diff -Naur maint-viewer/indra/newview/viewer_manifest.py maint-viewer-c/indra/newview/viewer_manifest.py
   2 --- maint-viewer/indra/newview/viewer_manifest.py       2009-02-01 03:17:09.000000000 +0100
   3 +++ maint-viewer-c/indra/newview/viewer_manifest.py     2009-02-09 14:39:57.000000000 +0100
   4 @@ -652,29 +652,41 @@
   5
   6          if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
   7  #            self.path("libkdu_v42R.so", "libkdu.so")
   8 -            self.path("libfmod-3.75.so")
   9 -            self.path("libapr-1.so.0")
  10 -            self.path("libaprutil-1.so.0")
  11 -            self.path("libdb-4.2.so")
  12 -            self.path("libcrypto.so.0.9.7")
  13 -            self.path("libexpat.so.1")
  14 -            self.path("libssl.so.0.9.7")
  15 -            self.path("libuuid.so", "libuuid.so.1")
  16 -            self.path("libSDL-1.2.so.0")
  17 -            self.path("libELFIO.so")
  18 -            self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
  19 -            self.path("libalut.so")
  20 -            self.path("libopenal.so", "libopenal.so.1")
  21 -            self.end_prefix("lib")
  22 +           try:
  23 +                self.path("libfmod-3.75.so")
  24 +                self.path("libapr-1.so.0")
  25 +                self.path("libaprutil-1.so.0")
  26 +                self.path("libdb-4.2.so")
  27 +                self.path("libcrypto.so.0.9.7")
  28 +                self.path("libexpat.so.1")
  29 +                self.path("libssl.so.0.9.7")
  30 +                self.path("libuuid.so", "libuuid.so.1")
  31 +                self.path("libSDL-1.2.so.0")
  32 +                self.path("libELFIO.so")
  33 +                self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
  34 +                self.path("libalut.so")
  35 +                self.path("libopenal.so", "libopenal.so.1")
  36 +                self.end_prefix("lib")
  37 +            except:
  38 +                print "Skipping prebuilt libs - not found"
  39 +                self.end_prefix("lib")
  40
  41              # Vivox runtimes
  42              if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
  43 -                    self.path("SLVoice")
  44 -                    self.end_prefix()
  45 +                    try:
  46 +                        self.path("SLVoice")
  47 +                        self.end_prefix()
  48 +                    except:
  49 +                        print "Skipping Vivox/bin - not found"
  50 +                        self.end_prefix()
  51              if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
  52 -                    self.path("libortp.so")
  53 -                    self.path("libvivoxsdk.so")
  54 -                    self.end_prefix("lib")
  55 +                    try:
  56 +                        self.path("libortp.so")
  57 +                        self.path("libvivoxsdk.so")
  58 +                        self.end_prefix("lib")
  59 +                    except:
  60 +                        print "Skipping Vivox/lib - not found"
  61 +                        self.end_prefix("lib")
  62
  63  class Linux_x86_64Manifest(LinuxManifest):
  64      def construct(self):