Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23231655abbd6aecee694b5380d5f5efe1ba2673
commit 23231655abbd6aecee694b5380d5f5efe1ba2673 Author: Devil505 <devil505li...@gmail.com> Date: Thu Sep 2 18:54:22 2010 +0200 toluapp-1.0.93-3-i686 * removing useless conf file * added patch from opensuse diff --git a/source/devel-extra/toluapp/FrugalBuild b/source/devel-extra/toluapp/FrugalBuild index dd745eb..058087e 100644 --- a/source/devel-extra/toluapp/FrugalBuild +++ b/source/devel-extra/toluapp/FrugalBuild @@ -3,7 +3,7 @@ pkgname=toluapp pkgver=1.0.93 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to integrate C/C++ code with Lua" url="http://www.codenix.com/~tolua/"; depends=('lua') @@ -12,13 +12,13 @@ groups=('devel-extra') archs=('i686' 'x86_64') _F_archive_name="tolua++" up2date="Flasttar $url" -source=($url/$_F_archive_name-$pkgver.tar.bz2 config_linux.py) +source=($url/$_F_archive_name-$pkgver.tar.bz2 makeso.patch) sha1sums=('4a4d4d948e03320ef74314aa6698677c0af4199f' \ '14208bd8678b265bc9cea4c6ce201c14fc6f4177') build() { - cp config_linux.py $_F_archive_name-$pkgver/ || Fdie Fcd + Fpatchall scons all || Fdie scons prefix=$Fdestdir/usr install || Fdie } diff --git a/source/devel-extra/toluapp/config_linux.py b/source/devel-extra/toluapp/config_linux.py deleted file mode 100644 index 380d310..0000000 --- a/source/devel-extra/toluapp/config_linux.py +++ /dev/null @@ -1,20 +0,0 @@ -## This is the linux configuration file -# use 'scons -h' to see the list of command line options available - -# Compiler flags (based on Debian's installation of lua) -#LINKFLAGS = ['-g'] -CCFLAGS = ['-I/usr/include', '-O2', '-ansi', '-Wall', '-fPIC'] -#CCFLAGS = ['-I/usr/include/lua50', '-g'] - -# this is the default directory for installation. Files will be installed on -# <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install' -# -# You can also specify this directory on the command line with the 'prefix' -# option -# -# You can see more 'generic' options for POSIX systems on config_posix.py - -prefix = '/var/tmp/fst/pkg/usr' - -# libraries (based on Debian's installation of lua) -LIBS = ['liblua', 'dl', 'm'] diff --git a/source/devel-extra/toluapp/makeso.patch b/source/devel-extra/toluapp/makeso.patch new file mode 100644 index 0000000..7f56e87 --- /dev/null +++ b/source/devel-extra/toluapp/makeso.patch @@ -0,0 +1,62 @@ +--- SConstruct 2008-04-20 19:05:35.000000000 -0500 ++++ SConstruct.orig 2010-04-05 22:58:15.007357388 -0500 +@@ -27,14 +27,14 @@ + opts.Add('LIBPATH', 'library path', []) + + opts.Add('tolua_bin', 'the resulting binary', 'tolua++') +-opts.Add('tolua_lib', 'the resulting library', 'tolua++') ++opts.Add('tolua_lib', 'the resulting library', 'tolua++-5.1') + opts.Add('TOLUAPP', 'the name of the tolua++ binary (to use with built_dev=1)', 'tolua++') + + opts.Add('prefix', 'The installation prefix') + opts.Add('build_dev', 'Build for development (uses tolua to rebuild toluabind.c with the embeded scripts', 0) + opts.Add('build_failsafe', "Build using 'factory default' toluabind file (in case build_dev fails)", 0) + opts.Add('ENV', 'The environment variables') +-opts.Add('shared', 'Build a shared object', False) ++opts.Add('shared', 'Build a shared object', True) + opts.Update(env) + Help(opts.GenerateHelpText(env)) + +--- config_linux.py 2005-11-30 16:31:27.000000000 -0600 ++++ config_linux.py.orig 2010-04-05 21:20:38.122745603 -0500 +@@ -4,8 +4,8 @@ + + # Compiler flags (based on Debian's installation of lua) + #LINKFLAGS = ['-g'] +-CCFLAGS = ['-I/usr/include/lua50', '-O2', '-ansi', '-Wall'] +-#CCFLAGS = ['-I/usr/include/lua50', '-g'] ++CCFLAGS = ['-I/usr/include/lua', '-O2', '-ansi', '-Wall'] ++#CCFLAGS = ['-I/usr/include/lua', '-g'] + + # this is the default directory for installation. Files will be installed on + # <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install' +@@ -15,8 +15,8 @@ + # + # You can see more 'generic' options for POSIX systems on config_posix.py + +-prefix = '/usr/local' ++prefix = '/usr' + + # libraries (based on Debian's installation of lua) +-LIBS = ['lua50', 'lualib50', 'dl', 'm'] ++LIBS = ['lua', 'liblua', 'dl', 'm'] + +--- custom-5.1.py 2008-04-20 19:05:35.000000000 -0500 ++++ custom-5.1.py.orig 2010-04-05 21:31:16.832389012 -0500 +@@ -1,9 +1,9 @@ +-CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi'] ++CCFLAGS = ['-I/usr/include/lua', '-O2', '-ansi'] + #LIBPATH = ['/usr/local/lib'] +-LIBS = ['lua5.1', 'dl', 'm'] ++LIBS = ['lua', 'dl', 'm'] + prefix = '/mingw' + #build_dev=1 +-tolua_bin = 'tolua++5.1' +-tolua_lib = 'tolua++5.1' ++tolua_bin = 'tolua++' ++tolua_lib = 'tolua++-5.1' + TOLUAPP = 'tolua++5.1' + + + + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
