From bc7c0285384b90de8cd1c3ec4fb60d383136501b Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 23 Jul 2009 22:56:04 +0000 Subject: [PATCH] Add ACLOCAL_FLAGS to autogen and --with-wx-config to configure for linux build factory. This is required since there are no system packages for 2.9 (as it hasn't been released yet.) Originally committed to SVN as r3236. --- devel/tinderbox/buildbot/master/master.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/devel/tinderbox/buildbot/master/master.cfg b/devel/tinderbox/buildbot/master/master.cfg index 3017e6687..b9304f1d0 100644 --- a/devel/tinderbox/buildbot/master/master.cfg +++ b/devel/tinderbox/buildbot/master/master.cfg @@ -124,6 +124,9 @@ flinux.addStep(source.SVN(mode="clobber", svnurl=source_unix)) flinux.addStep(shell.ShellCommand( command=["./autogen.sh", "--skip-configure"], + env={ + 'ACLOCAL_FLAGS': '-I /home/verm/build/wx/share/aclocal' + } name = "autogen", description = ["autogening"], descriptionDone = ["autogen"], @@ -134,7 +137,9 @@ flinux.addStep(shell.ShellCommand( command=["./configure", WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), "--disable-check-wx-stc", - "--disable-check-wx-opengl" + "--disable-check-wx-opengl", + "--with-wx-config=/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9" + " ], env={ 'CC': '/usr/lib/ccache/gcc',