From b0063ff46d81365d1e7a6ff3546e71d4e105201f Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sun, 26 Jul 2009 16:46:50 +0000 Subject: [PATCH] * Add the libdir to our local wx installation using -rpath. * Fix location of wx-config on the PPC buildbot. Originally committed to SVN as r3291. --- devel/tinderbox/buildbot/master/master.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/tinderbox/buildbot/master/master.cfg b/devel/tinderbox/buildbot/master/master.cfg index 3ca42f9cc..39191416f 100644 --- a/devel/tinderbox/buildbot/master/master.cfg +++ b/devel/tinderbox/buildbot/master/master.cfg @@ -143,6 +143,7 @@ flinux.addStep(shell.ShellCommand( env={ 'CC': '/usr/lib/ccache/gcc', 'CXX': '/usr/lib/ccache/g++', + 'LDFLAGS': '-rpath /home/verm/build/wx/lib/', 'CCACHE_PATH': '/usr/bin', 'CCACHE_DIR': '/home/verm/.ccache', 'LUA_CFLAGS': '-I/usr/include/lua5.1', @@ -211,7 +212,7 @@ ffbsd.addStep(shell.ShellCommand( 'CXX': '/usr/local/libexec/ccache/g++', 'CFLAGS': '-I/usr/local/include', 'CXXFLAGS': '-I/usr/local/include', - 'LDFLAGS': '-L/usr/local/lib', + 'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx/lib', 'LUA_CFLAGS': '-I/usr/local/include/lua51', 'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1' }, @@ -408,7 +409,7 @@ fosx_ppc.addStep(shell.ShellCommand( "--prefix=/Users/verm/prefix", WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), "--with-apple-opengl-framework", - "--with-wx-config=/Users/verm/prefix/lib/wx/config/mac-unicode-debug-2.8", + "--with-wx-config=/Users/verm/prefix/lib/wx/config/osx_carbon-unicode-debug-2.9", "--enable-debug" "--prefix=/Users/verm/i", "--disable-check-wx-opengl",