From 0700482f6665ce98d7bc5356e805d45bc90f74fe Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 9 Feb 2022 21:57:11 +0000
Subject: [PATCH] Update boost and colladadom with packages build on Bionic
 Beaver, good bye Xenial Xerus old friend, you served us well over the years.

---
 autobuild.xml               | 20 ++++----------------
 indra/cmake/00-Common.cmake |  4 ----
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index e25cef33e2..13185c91f2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -480,9 +480,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>29eb0d338020242454b77b278c11d3e7</string>
+              <string>401f317fbb67623c97a7b9d8b6627ef1</string>
               <key>url</key>
-              <string>http://3p.firestormviewer.org/boost-1.72-linux64-202021511.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/boost-1.72-linux64_bionic-220402045.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -605,26 +605,14 @@
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>d83896f28716f34b7b49d61a23283c4c</string>
-              <key>url</key>
-              <string>http://3p.firestormviewer.org/colladadom-2.3.180871403-linux-180871403.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
           <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>df6fe4c80b96ec20b5ee6f56419e6b9f</string>
+              <string>88ee58d6548deae6c306f125b6461d61</string>
               <key>url</key>
-              <string>http://3p.firestormviewer.org/colladadom-2.3.202021526-linux64-202021526.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/colladadom-2.3.220402056-linux64_bionic-220402056.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 6909a94e4b..076e774952 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -225,10 +225,6 @@ if (LINUX)
   endif (NOT USESYSTEMLIBS)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
-
-  if( NOT (CMAKE_CXX_COMPILER MATCHES ".*clang") )
-	set( CMAKE_CXX_FLAGS "-fabi-version=9 ${CMAKE_CXX_FLAGS}" ) 
-  endif()
 endif (LINUX)