[arch-commits] Commit in tolua++/trunk (PKGBUILD config_linux.py)

[Sven-Hendrik Haase]

    Date: Tuesday, November 24, 2015 @ 09:09:51
  Author: svenstaro
Revision: 147630

upgpkg: tolua++ 1.0.93-2

Fix and rebuild

Modified:
  tolua++/trunk/PKGBUILD
Deleted:
  tolua++/trunk/config_linux.py

-----------------+
 PKGBUILD        |   28 ++++++++++++++--------------
 config_linux.py |   22 ----------------------
 2 files changed, 14 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-24 07:33:08 UTC (rev 147629)
+++ PKGBUILD	2015-11-24 08:09:51 UTC (rev 147630)
@@ -5,31 +5,31 @@
 
 pkgname=tolua++
 pkgver=1.0.93
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to integrate C/C++ code with Lua"
 arch=('i686' 'x86_64')
-url="http://www.codenix.com/~tolua"
+url="https://github.com/LuaDist/toluapp"
 license=('MIT')
 depends=('lua51')
-makedepends=('scons')
+makedepends=('cmake' 'git')
 options=('staticlibs')
-source=(http://www.codenix.com/~tolua/${pkgname}-${pkgver}.tar.bz2
-        config_linux.py)
-md5sums=('100aa6907b8108582080b37d79c0afd7'
-         '69ad5067084cec2924f172bb04700da6')
-provides=('toluapp')
+source=(git+https://github.com/LuaDist/toluapp.git#tag=${pkgver})
+md5sums=('SKIP')
 
 build() {
-    cd ${pkgname}-${pkgver}
-    cp ../config_linux.py "${srcdir}"/${pkgname}-${pkgver}
+    cd toluapp
 
-    scons all
+    rm -rf build && mkdir build
+    cd build
+
+    cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 }
 
 package() {
-    cd ${pkgname}-${pkgver}
-    scons prefix="${pkgdir}/usr" install
+    cd toluapp/build
 
+    make DESTDIR="${pkgdir}" install
+
     # install license files
-    install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+    install -Dm644 "$srcdir/toluapp/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
 }

Deleted: config_linux.py
===================================================================
--- config_linux.py	2015-11-24 07:33:08 UTC (rev 147629)
+++ config_linux.py	2015-11-24 08:09:51 UTC (rev 147630)
@@ -1,22 +0,0 @@
-## This is the linux configuration file
-# This file was adapted to be used with ArchLinux
-# Use 'scons -h' to see the list of command line options available
-
-# Compiler flags (based on ArchLinux's installation of lua)
-#LINKFLAGS = ['-g']
-CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi', '-Wall', '-fPIC']
-#CCFLAGS = ['-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 = '/usr'
-
-# libraries (based on ArchLinux's installation of lua)
-LIBS = ['lua5.1', 'dl', 'm']
-