From b39aa27e3c8aa73722e9c63bf3cbf02880ed29e7 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 23 Jul 2009 20:40:36 +0000 Subject: [PATCH] Remove PERL, Ruby, auto3 (lua50) flags and variables as all 3 have been removed in trunk. Originally committed to SVN as r3230. --- devel/tinderbox/buildbot/master/master.cfg | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/devel/tinderbox/buildbot/master/master.cfg b/devel/tinderbox/buildbot/master/master.cfg index b931e317f..3017e6687 100644 --- a/devel/tinderbox/buildbot/master/master.cfg +++ b/devel/tinderbox/buildbot/master/master.cfg @@ -28,7 +28,6 @@ re_common = [ '^trunk/aegisub/.*\.cpp$', '^trunk/aegisub/.*\.h$', '^trunk/aegisub/FFmpegSource2/.*', - '^trunk/aegisub/src/libauto3/.*', '^trunk/aegisub/src/include/aegisub/.*', '^trunk/aegisub/src/boost/.*', '^trunk/aegisub/src/bitmaps/.*', @@ -58,7 +57,6 @@ re_osx = [ re_windows = [ '^trunk/aegisub/build/.*', '^trunk/contrib/csri/.*', - '^trunk/contrib/lua50/.*', '^trunk/contrib/lua51/.*', '^trunk/contrib/hunspell/.*', '^trunk/aegisub/packages/win_installer/.*', @@ -144,9 +142,7 @@ flinux.addStep(shell.ShellCommand( 'CCACHE_PATH': '/usr/bin', 'CCACHE_DIR': '/home/verm/.ccache', 'LUA_CFLAGS': '-I/usr/include/lua5.1', - 'LUA_LDFLAGS': '-llua5.1', - 'LUA50_CFLAGS': '-I /usr/include/lua50', - 'LUA50_LDFLAGS': '-llua50 -llualib50' + 'LUA_LDFLAGS': '-llua5.1' }, name = "configure", description = ["configuring"], @@ -212,8 +208,6 @@ ffbsd.addStep(shell.ShellCommand( 'CFLAGS': '-I/usr/local/include', 'CXXFLAGS': '-I/usr/local/include', 'LDFLAGS': '-L/usr/local/lib', - 'LUA50_CFLAGS': '-I/usr/local/include/lua50', - 'LUA50_LDFLAGS': '-L/usr/local/lib -llua-5.0 -llualib-5.0', 'LUA_CFLAGS': '-I/usr/local/include/lua51', 'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1' }, @@ -318,17 +312,12 @@ fosx.addStep(shell.ShellCommand( 'PKG_CONFIG_PATH': '/Users/verm/prefix/lib/pkgconfig', 'CXXFLAGS': '-I/Users/verm/prefix/include', 'LDFLAGS': '-L/Users/verm/prefix/lib', - 'LUA50_CFLAGS': '-I/Users/verm/prefix/include/lua50', - 'LUA50_LDFLAGS': '-L/Users/verm/prefix/lib/lua50 -llua-5.0 -llualib-5.0', 'LUA_CFLAGS': '-I/Users/verm/prefix/include/lua51', 'LUA_LDFLAGS': '-L/Users/verm/prefix/lib/lua51 -llua', 'OPENAL_CFLAGS': '-framework OpenAL', 'OPENAL_LIBS': '-framework OpenAL', 'CFLAGS': '-I/Developer/SDKs/MacOSX10.5.sdk/usr/include', 'ICONV_LDFLAGS': '/usr/lib/libiconv.dylib', - 'PERL_CFLAGS': '-I/System/Library/Perl/5.8.8/darwin-thread-multi-2level/CORE -arch i386 -g -pipe -fno-common -DPERL_DARWIN -no-cpp-precomp -fno-strict-aliasing -Wdeclaration-after-statement -I/usr/local/include', - 'PERL_LDFLAGS': '-arch i386 -L/usr/local/lib /System/Library/Perl/5.8.8/darwin-thread-multi-2level/auto/DynaLoader/DynaLoader.a -L/System/Library/Perl/5.8.8/darwin-thread-multi-2level/CORE -lperl -ldl -lm -lutil -lc', - 'RUBY_CFLAGS': '-I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -arch i386 -Os -pipe -fno-common' }, name = "configure", description = ["configuring"], @@ -431,17 +420,12 @@ fosx_ppc.addStep(shell.ShellCommand( 'PKG_CONFIG_PATH': '/Users/verm/prefix/lib/pkgconfig', 'CXXFLAGS': '-I/Users/verm/prefix/include', 'LDFLAGS': '-L/Users/verm/prefix/lib', - 'LUA50_CFLAGS': '-I/Users/verm/prefix/include/lua50', - 'LUA50_LDFLAGS': '-L/Users/verm/prefix/lib/lua50 -llua-5.0 -llualib-5.0', 'LUA_CFLAGS': '-I/Users/verm/prefix/include/lua51', 'LUA_LDFLAGS': '-L/Users/verm/prefix/lib/lua51 -llua', 'OPENAL_CFLAGS': '-framework OpenAL', 'OPENAL_LIBS': '-framework OpenAL', 'CFLAGS': '-I/Developer/SDKs/MacOSX10.5.sdk/usr/include', 'ICONV_LDFLAGS': '/usr/lib/libiconv.dylib', - 'PERL_CFLAGS': '-I/System/Library/Perl/5.8.6/darwin-thread-multi-2level/CORE -g -pipe -fno-common -DPERL_DARWIN -no-cpp-precomp -fno-strict-aliasing -I/usr/local/include', - 'PERL_LDFLAGS': '-L/usr/local/lib /System/Library/Perl/5.8.6/darwin-thread-multi-2level/auto/DynaLoader/DynaLoader.a -L/System/Library/Perl/5.8.6/darwin-thread-multi-2level/CORE -lperl -ldl -lm -lc', - 'RUBY_CFLAGS': '-I/usr/lib/ruby/1.8/powerpc-darwin8.0 -I/usr/lib/ruby/1.8/universal-darwin8.0 -g -Os -pipe -fno-common' }, name = "configure", description = ["configuring"],