Author: lisu Date: Tue Nov 9 12:24:50 2010 GMT Module: packages Tag: HEAD ---- Log message: - pass rpmcflags
---- Files affected: packages/tolua++: tolua++-lua51.patch (1.1 -> 1.2) , tolua++.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: packages/tolua++/tolua++-lua51.patch diff -u packages/tolua++/tolua++-lua51.patch:1.1 packages/tolua++/tolua++-lua51.patch:1.2 --- packages/tolua++/tolua++-lua51.patch:1.1 Mon Nov 8 14:53:41 2010 +++ packages/tolua++/tolua++-lua51.patch Tue Nov 9 13:24:45 2010 @@ -1,14 +1,5 @@ --- tolua++-1.0.93/config_linux.py~ 2005-11-30 23:31:27.000000000 +0100 +++ tolua++-1.0.93/config_linux.py 2010-11-08 14:34:33.795188003 +0100 -@@ -4,7 +4,7 @@ - - # Compiler flags (based on Debian's installation of lua) - #LINKFLAGS = ['-g'] --CCFLAGS = ['-I/usr/include/lua50', '-O2', '-ansi', '-Wall'] -+CCFLAGS = ['-I/usr/include/lua51', '-O2', '-ansi', '-Wall'] - #CCFLAGS = ['-I/usr/include/lua50', '-g'] - - # this is the default directory for installation. Files will be installed on @@ -15,8 +15,8 @@ # # You can see more 'generic' options for POSIX systems on config_posix.py ================================================================ Index: packages/tolua++/tolua++.spec diff -u packages/tolua++/tolua++.spec:1.20 packages/tolua++/tolua++.spec:1.21 --- packages/tolua++/tolua++.spec:1.20 Tue Nov 9 10:35:38 2010 +++ packages/tolua++/tolua++.spec Tue Nov 9 13:24:45 2010 @@ -9,7 +9,6 @@ Source0: http://www.codenix.com/~tolua/%{name}-%{version}.tar.bz2 # Source0-md5: 100aa6907b8108582080b37d79c0afd7 Patch0: %{name}-lua51.patch -Patch1: %{name}-compile.patch URL: http://www.codenix.com/~tolua/ BuildRequires: lua51-devel BuildRequires: scons @@ -62,10 +61,10 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -%scons +%scons \ + CCFLAGS="%{rpmcflags} -I/usr/include/lua51 -ansi -fPIC" %{__cc} src/lib/tolua_{event,is,map,push,to}.o -shared -llua51 -ldl -lm -o lib/libtolua++.so %{__cc} -o bin/tolua++ src/bin/toluabind.o src/bin/tolua.o -Llib -ltolua++ @@ -104,6 +103,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2010/11/09 12:24:45 lisu +- pass rpmcflags + Revision 1.20 2010/11/09 09:35:38 lisu - reverse split, devel subpackage is sufficient - rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tolua++/tolua++-lua51.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tolua++/tolua++.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
