From 5c1939a49e8717d56700d1a2893cbfe71f944979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 9 Apr 2014 14:21:05 +0200 Subject: [PATCH] package: adapt GCC 4.4/4.5 PKGBUILD to recent changes. --- package/archlinux/PKGBUILD-gcc44 | 6 ++++-- package/archlinux/PKGBUILD-gcc45 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/archlinux/PKGBUILD-gcc44 b/package/archlinux/PKGBUILD-gcc44 index 0d7a562b9..99074611e 100644 --- a/package/archlinux/PKGBUILD-gcc44 +++ b/package/archlinux/PKGBUILD-gcc44 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'ninja' 'gcc44') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { @@ -30,8 +30,10 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ + -DWITH_OBJIMPORTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ @@ -45,7 +47,7 @@ build() { check() { cd "$startdir/build-gcc44" - ctest --output-on-failure + ctest --output-on-failure -j5 } package() { diff --git a/package/archlinux/PKGBUILD-gcc45 b/package/archlinux/PKGBUILD-gcc45 index 3bedc19f4..a5ab0fa9c 100644 --- a/package/archlinux/PKGBUILD-gcc45 +++ b/package/archlinux/PKGBUILD-gcc45 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'ninja' 'gcc45') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { @@ -30,8 +30,10 @@ build() { -DWITH_GLUTAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ + -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ + -DWITH_OBJIMPORTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ @@ -45,7 +47,7 @@ build() { check() { cd "$startdir/build-gcc45" - ctest --output-on-failure + ctest --output-on-failure -j5 } package() {