[Scummvm-cvs-logs] SF.net SVN: scummvm:[56220] buildbot/config/master.cfg
tdhs at users.sourceforge.net
tdhs at users.sourceforge.net
Thu Dec 29 03:47:20 CET 2011
Revision: 56220
http://scummvm.svn.sourceforge.net/scummvm/?rev=56220&view=rev
Author: tdhs
Date: 2011-12-29 02:47:18 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
BUILDBOT: Add support for LD_LIBRARY_PATH and LD_PRELOAD
This is needed to enable a hack to run the WebOS PDK without updating the global system libraries.. However, this is currently not successful when enabled (Gives OOM errors with LD_PRELOAD).
Modified Paths:
--------------
buildbot/config/master.cfg
Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg 2011-12-24 20:21:41 UTC (rev 56219)
+++ buildbot/config/master.cfg 2011-12-29 02:47:18 UTC (rev 56220)
@@ -58,12 +58,17 @@
DEFAULT_PATH = "/usr/bin:/bin"
#DEFAULT_PATH = os.environ["PATH"]
+DEFAULT_LD_LIBRARY_PATH = ""
+#DEFAULT_LD_LIBRARY_PATH = os.environ["LD_LIBRARY_PATH"]
+
scumm_env = {
"LC_ALL": "C",
"CXX": "",
"CXXFLAGS": "",
"CPPFLAGS": "",
"LDFLAGS": "",
+ "LD_LIBRARY_PATH": DEFAULT_LD_LIBRARY_PATH,
+ "LD_PRELOAD": "",
"CCACHE_COMPRESS": "1",
"PATH": DEFAULT_PATH
}
@@ -622,6 +627,8 @@
scumm_env_webos = copy.deepcopy(scumm_env)
scumm_env_webos["PATH"] = "%s/PalmPDK/arm-gcc/bin:%s" % (scumm_root_webos, DEFAULT_PATH)
scumm_env_webos["CXX"] = "ccache arm-none-linux-gnueabi-g++"
+#scumm_env_webos["LD_LIBRARY_PATH"] = "%s/libc6_2.11.2-10_i386/lib:%s" % (scumm_root_webos, DEFAULT_LD_LIBRARY_PATH)
+#scumm_env_webos["LD_PRELOAD"] = "%s/libc6_2.11.2-10_i386/lib/ld-linux.so.2 %s/libc6_2.11.2-10_i386/lib/libc.so.6" % (scumm_root_webos, scumm_root_webos)
scumm_env_webos["WEBOS_SDK"] = "%s/PalmSDK/Current" % scumm_root_webos
scumm_env_webos["WEBOS_PDK"] = "%s/PalmPDK" % scumm_root_webos
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list