[mapguide-commits] r8400 - trunk/Tools/Vagrant/scripts

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-10-10 02:03:25 -0700 (Fri, 10 Oct 2014)
New Revision: 8400

Modified:
   trunk/Tools/Vagrant/scripts/build_fdo.sh
Log:
Update FDO build script for 64-bit Linux

Modified: trunk/Tools/Vagrant/scripts/build_fdo.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/build_fdo.sh	2014-10-09 17:04:43 UTC (rev 8399)
+++ trunk/Tools/Vagrant/scripts/build_fdo.sh	2014-10-10 09:03:25 UTC (rev 8400)
@@ -140,7 +140,7 @@
             ln -s /usr/lib ${MY_HOME_DIR}/fdo_rdbms_thirdparty_system/pgsql/$FDO_CPU/$LIB_DIRNAME
             echo "[info]: Symlinked PostgreSQL lib path (x86)"
         else
-            ln -s /usr/lib64 ${MY_HOME_DIR}/fdo_rdbms_thirdparty_system/pgsql/$FDO_CPU/$LIB_DIRNAME
+            ln -s /usr/lib ${MY_HOME_DIR}/fdo_rdbms_thirdparty_system/pgsql/$FDO_CPU/$LIB_DIRNAME
             echo "[info]: Symlinked PostgreSQL lib path (x64)"
         fi
     else
@@ -204,7 +204,12 @@
         mkdir -p $FDO_BUILD_AREA/Thirdparty/libcurl/lib
         if [ ! -e $FDO_BUILD_AREA/Thirdparty/libcurl/lib/linux ];
         then
-            ln -s /usr/lib/i386-linux-gnu $FDO_BUILD_AREA/Thirdparty/libcurl/lib/linux
+            if [ ${FDO_PLATFORM} -eq 32 ]; 
+            then
+                ln -s /usr/lib/i386-linux-gnu $FDO_BUILD_AREA/Thirdparty/libcurl/lib/linux
+            else
+                ln -s /usr/lib/x86_64-linux-gnu $FDO_BUILD_AREA/Thirdparty/libcurl/lib/linux
+            fi
         fi
 
         # symlink openssl to system installed copy
@@ -219,7 +224,12 @@
         mkdir -p $FDO_BUILD_AREA/Thirdparty/openssl/lib
         if [ ! -e $FDO_BUILD_AREA/Thirdparty/openssl/lib/linux ];
         then
-            ln -s /usr/lib/i386-linux-gnu $FDO_BUILD_AREA/Thirdparty/openssl/lib/linux
+            if [ ${FDO_PLATFORM} -eq 32 ]; 
+            then
+                ln -s /usr/lib/i386-linux-gnu $FDO_BUILD_AREA/Thirdparty/openssl/lib/linux
+            else
+                ln -s /usr/lib/x86_64-linux-gnu $FDO_BUILD_AREA/Thirdparty/openssl/lib/linux
+            fi
         fi
         echo "[info]: Replace internal openssl/libcurl with symlinks to Ubuntu-installed copies"
     fi
@@ -547,4 +557,4 @@
 fi
 
 echo "[info]: FDO build complete!"
-echo Main build execution time: `expr $end_time - $start_time` s
\ No newline at end of file
+echo Main build execution time: `expr $end_time - $start_time` s