mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

* Add the libdir to our local wx installation using -rpath.

Browse source 
* Fix location of wx-config on the PPC buildbot.

Originally committed to SVN as r3291.
This commit is contained in:
Amar Takhar 2009-07-26 16:46:50 +00:00
parent 9159721be7
commit b0063ff46d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/tinderbox/buildbot/master/master.cfg
View file

@ -143,6 +143,7 @@ flinux.addStep(shell.ShellCommand(
env={ env={
'CC': '/usr/lib/ccache/gcc', 'CC': '/usr/lib/ccache/gcc',
'CXX': '/usr/lib/ccache/g++', 'CXX': '/usr/lib/ccache/g++',
'LDFLAGS': '-rpath /home/verm/build/wx/lib/',
'CCACHE_PATH': '/usr/bin', 'CCACHE_PATH': '/usr/bin',
'CCACHE_DIR': '/home/verm/.ccache', 'CCACHE_DIR': '/home/verm/.ccache',
'LUA_CFLAGS': '-I/usr/include/lua5.1', 'LUA_CFLAGS': '-I/usr/include/lua5.1',
@ -211,7 +212,7 @@ ffbsd.addStep(shell.ShellCommand(
'CXX': '/usr/local/libexec/ccache/g++', 'CXX': '/usr/local/libexec/ccache/g++',
'CFLAGS': '-I/usr/local/include', 'CFLAGS': '-I/usr/local/include',
'CXXFLAGS': '-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_CFLAGS': '-I/usr/local/include/lua51',
'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1' 'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1'
}, },
@ -408,7 +409,7 @@ fosx_ppc.addStep(shell.ShellCommand(
"--prefix=/Users/verm/prefix", "--prefix=/Users/verm/prefix",
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
"--with-apple-opengl-framework", "--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" "--enable-debug"
"--prefix=/Users/verm/i", "--prefix=/Users/verm/i",
"--disable-check-wx-opengl", "--disable-check-wx-opengl",