[Scummvm-cvs-logs] SF.net SVN: scummvm:[56227] buildbot/config/master.cfg

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Fri Jan 20 23:15:46 CET 2012


Revision: 56227
          http://scummvm.svn.sourceforge.net/scummvm/?rev=56227&view=rev
Author:   dhewg
Date:     2012-01-20 22:15:45 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
BUILDBOT: Revert LD_LIBRARY_PATH and LD_PRELOAD hacks

Not required anymore.

Modified Paths:
--------------
    buildbot/config/master.cfg

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2012-01-17 20:58:35 UTC (rev 56226)
+++ buildbot/config/master.cfg	2012-01-20 22:15:45 UTC (rev 56227)
@@ -58,17 +58,12 @@
 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
 }
@@ -627,8 +622,6 @@
 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