[mapguide-commits] r10004 - in trunk/MgDev: . cmake/configs

[svn_mapguide at osgeo.org]

Author: jng
Date: 2022-11-02 00:37:15 -0700 (Wed, 02 Nov 2022)
New Revision: 10004

Modified:
   trunk/MgDev/CMakeLists.txt
   trunk/MgDev/cmake/configs/mgserver.sh.in
   trunk/MgDev/cmake/configs/mgserverd.sh.in
Log:
#2855: For reasons currently unknown, the mgserver executable when built on Ubuntu 22.04 currently has several unresolved .so dependencies when inspected with ldd, despite the .so files actually existing on the RPATHs defined in the mgserver executable. As a workaround, the paths in question are also added to LD_LIBRARY_PATH in mgserver.sh and mgserverd.sh, which is enough of a sturdy band-aid for the current problem

Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt	2022-11-01 15:03:47 UTC (rev 10003)
+++ trunk/MgDev/CMakeLists.txt	2022-11-02 07:37:15 UTC (rev 10004)
@@ -75,7 +75,7 @@
 set(MG_VERSION_FULL "${MG_VERSION}.${MG_VERSION_REV}")
 
 message(STATUS "MapGuide Version: ${MG_VERSION_MAJOR}.${MG_VERSION_MINOR}.${MG_VERSION_RELEASE}.${MG_VERSION_REV}")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 set(MG_HTTPD_PORT 8008)
 set(MG_TOMCAT_PORT 8009)

Modified: trunk/MgDev/cmake/configs/mgserver.sh.in
===================================================================
--- trunk/MgDev/cmake/configs/mgserver.sh.in	2022-11-01 15:03:47 UTC (rev 10003)
+++ trunk/MgDev/cmake/configs/mgserver.sh.in	2022-11-02 07:37:15 UTC (rev 10004)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH=@MG_INSTALL_PREFIX@/server/bin:$PATH
-export LD_LIBRARY_PATH=@FDO_LIBRARY_DIR@:"$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=@FDO_LIBRARY_DIR@:@MG_INSTALL_PREFIX@/lib64:@MG_INSTALL_PREFIX@/server/lib64:"$LD_LIBRARY_PATH"
 export NLSPATH=@FDO_NLS_DIR@/%N:"$NLSPATH"
 mkdir -p /var/lock/mgserver
 pushd @MG_INSTALL_PREFIX@/server/bin

Modified: trunk/MgDev/cmake/configs/mgserverd.sh.in
===================================================================
--- trunk/MgDev/cmake/configs/mgserverd.sh.in	2022-11-01 15:03:47 UTC (rev 10003)
+++ trunk/MgDev/cmake/configs/mgserverd.sh.in	2022-11-02 07:37:15 UTC (rev 10004)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export PATH=@MG_INSTALL_PREFIX@/server/bin:$PATH
-export LD_LIBRARY_PATH=@FDO_LIBRARY_DIR@:"$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=@FDO_LIBRARY_DIR@:@MG_INSTALL_PREFIX@/lib64:@MG_INSTALL_PREFIX@/server/lib64:"$LD_LIBRARY_PATH"
 export NLSPATH=@FDO_NLS_DIR@/%N:"$NLSPATH"
 mkdir -p /var/lock/mgserver
 pushd @MG_INSTALL_PREFIX@/server/bin