diff options
author | Adrián Pérez de Castro | 2015-11-19 16:24:41 +0200 |
---|---|---|
committer | Adrián Pérez de Castro | 2015-11-19 16:24:41 +0200 |
commit | 96d2010f6e38f5c3a9d3bb3f643edef64eb00fd7 (patch) | |
tree | 81373c04443c1ebee8df499f23ddada1b2730232 | |
parent | e1f34c9ba2633ef8016ab8052e45c1112bc43abe (diff) | |
download | aur-96d2010f6e38f5c3a9d3bb3f643edef64eb00fd7.tar.gz |
Build in release mode, remove packaging kludges
When building in release mode, the CMake build configuration will respect
CMAKE_INSTALL_PREFIX, while development builds are expected to be run from
the same directory used for building. Using a release build makes it possible
to remove the workarounds in package().
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 7 insertions, 19 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Nov 18 20:09:48 UTC 2015 +# Thu Nov 19 14:24:18 UTC 2015 pkgbase = torch7-git pkgdesc = LuaJIT-based scientific computing framework - pkgver = r817.91a2970 - pkgrel = 2 + pkgver = r819.c2b91e6 + pkgrel = 1 url = http://torch.ch arch = x86_64 arch = i686 @@ -1,8 +1,8 @@ # Maintainer: Adrián Pérez de Castro <aperez@igalia.com> pkgdesc='LuaJIT-based scientific computing framework' pkgname='torch7-git' -pkgver=r817.91a2970 -pkgrel=2 +pkgver=r819.c2b91e6 +pkgrel=1 url='http://torch.ch' source=("${pkgname}::git://github.com/torch/torch7") depends=('luajit' 'blas' 'lapack' 'torch7-cwrap-git' 'torch7-paths-git') @@ -24,9 +24,11 @@ pkgver () { build () { cd "${pkgname}" cmake . \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLUADIR=/usr/share/lua/5.1 \ -DLIBDIR=/usr/lib/lua/5.1 \ + -DLUA_BINDIR=/usr/bin \ -DLUA_INCDIR=/usr/include/luajit-2.0 \ -DLUA_LIBDIR=/usr/lib \ -DLUALIB=/usr/lib/libluajit-5.1.so \ @@ -37,19 +39,5 @@ build () { package () { cd "${pkgname}" make DESTDIR="${pkgdir}" install - - # Ugh. CMake does a monstrosity here. - local base="${pkgdir}${srcdir}" - - # Relocate CMake module files - mkdir -p "${pkgdir}/usr/share/cmake/Modules/" - mv "${base}/share/cmake/torch"/*.cmake \ - "${pkgdir}/usr/share/cmake/Modules/" - - # Clean up junk - cd "${pkgdir}" - for name in * ; do - [[ ${name} == usr ]] || rm -rf "${name}" - done } |