Removed prepackaged libstdc++ (Linux only). Fixes VWR-12404.

author: Jacek Antonelli 2009-11-18 03:33:47 -0600
committer: Jacek Antonelli 2009-11-18 03:41:03 -0600
commit: 76f15e2b96447847d4399816dc6de02a6fe0e941 (patch)
tree: 35206194f4e54a1e8d56d35314c42fc7adeaf8e9 /linden
parent: Fixed more warnings about converting string to gchar* (diff)
download: meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.zip
meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.tar.gz
meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.tar.bz2
meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.tar.xz
2 files changed, 0 insertions, 34 deletions
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 68ee881..2a8abda 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -2,7 +2,6 @@
 include(Prebuilt)
 if (NOT STANDALONE)
-  use_prebuilt_binary(libstdc++)
  use_prebuilt_binary(libuuid)
  use_prebuilt_binary(vivox)
  use_prebuilt_binary(fontconfig)
diff --git a/linden/install.xml b/linden/install.xml
index 7567697..69e928a 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -871,39 +871,6 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
          </map>
        </map>
      </map>
-      <key>libstdc++</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
-        <key>description</key>
-        <string>Bundled library.</string>
-        <key>license</key>
-        <string>gpl</string>
-        <key>packages</key>
-        <map>
-          <key>linux</key>
-          <map>
-            <key>md5sum</key>
-            <string>1464a75ec87ee28e3b4f7840e9af41e3</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.0-linux-20080812.tar.bz2</uri>
-          </map>
-          <key>linux32</key>
-          <map>
-            <key>md5sum</key>
-            <string>1218347dd70c3b471530793d0fc09b69</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.4.1-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>9a191dc453017b19c5803b046d82f32a</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.4.1-linux64-20080909.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
      <key>libuuid</key>
      <map>
        <key>copyright</key>
author	Jacek Antonelli	2009-11-18 03:33:47 -0600
committer	Jacek Antonelli	2009-11-18 03:41:03 -0600
commit	76f15e2b96447847d4399816dc6de02a6fe0e941 (patch)
tree	35206194f4e54a1e8d56d35314c42fc7adeaf8e9 /linden
parent	Fixed more warnings about converting string to gchar* (diff)
download	meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.zip meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.tar.gz meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.tar.bz2 meta-impy-76f15e2b96447847d4399816dc6de02a6fe0e941.tar.xz

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake index 68ee881..2a8abda 100644 --- a/linden/indra/cmake/ViewerMiscLibs.cmake +++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -2,7 +2,6 @@
2	include(Prebuilt)	2	include(Prebuilt)
3		3
4	if (NOT STANDALONE)	4	if (NOT STANDALONE)
5	use_prebuilt_binary(libstdc++)
6	use_prebuilt_binary(libuuid)	5	use_prebuilt_binary(libuuid)
7	use_prebuilt_binary(vivox)	6	use_prebuilt_binary(vivox)
8	use_prebuilt_binary(fontconfig)	7	use_prebuilt_binary(fontconfig)


diff --git a/linden/install.xml b/linden/install.xml index 7567697..69e928a 100644 --- a/linden/install.xml +++ b/linden/install.xml
@@ -871,39 +871,6 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
871	</map>	871	</map>
872	</map>	872	</map>
873	</map>	873	</map>
874	<key>libstdc++</key>
875	<map>
876	<key>copyright</key>
877	<string>Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/></string>
878	<key>description</key>
879	<string>Bundled library.</string>
880	<key>license</key>
881	<string>gpl</string>
882	<key>packages</key>
883	<map>
884	<key>linux</key>
885	<map>
886	<key>md5sum</key>
887	<string>1464a75ec87ee28e3b4f7840e9af41e3</string>
888	<key>url</key>
889	<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.0-linux-20080812.tar.bz2</uri>
890	</map>
891	<key>linux32</key>
892	<map>
893	<key>md5sum</key>
894	<string>1218347dd70c3b471530793d0fc09b69</string>
895	<key>url</key>
896	<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.4.1-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
897	</map>
898	<key>linux64</key>
899	<map>
900	<key>md5sum</key>
901	<string>9a191dc453017b19c5803b046d82f32a</string>
902	<key>url</key>
903	<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libstdc++-6.4.1-linux64-20080909.tar.bz2</uri>
904	</map>
905	</map>
906	</map>
907	<key>libuuid</key>	874	<key>libuuid</key>
908	<map>	875	<map>
909	<key>copyright</key>	876	<key>copyright</key>