From 132c2f4e64af5a9336ca179aa773f39093921a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 23 Jan 2014 23:08:20 +0100 Subject: [PATCH] package: ensure that static libs are being kept in ArchLinux packages. I forgot to merge my /etc/makepkg.conf.pacnew and thus didn't notice it until now. --- package/archlinux/PKGBUILD | 2 +- package/archlinux/PKGBUILD-clang | 2 +- package/archlinux/PKGBUILD-clang-libc++ | 2 +- package/archlinux/PKGBUILD-emscripten | 2 +- package/archlinux/PKGBUILD-es2 | 2 +- package/archlinux/PKGBUILD-es2desktop | 2 +- package/archlinux/PKGBUILD-es3 | 2 +- package/archlinux/PKGBUILD-es3desktop | 2 +- package/archlinux/PKGBUILD-gcc46 | 2 +- package/archlinux/PKGBUILD-gcc47 | 2 +- package/archlinux/PKGBUILD-gcc49 | 2 +- package/archlinux/PKGBUILD-mingw32 | 2 +- package/archlinux/PKGBUILD-nacl-glibc | 2 +- package/archlinux/PKGBUILD-nacl-newlib | 2 +- package/archlinux/PKGBUILD-release | 1 + package/archlinux/magnum-git/PKGBUILD | 3 ++- 16 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 79a64b1a6..c21cc7040 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang index f98b4b14e..45f89c36a 100644 --- a/package/archlinux/PKGBUILD-clang +++ b/package/archlinux/PKGBUILD-clang @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'clang' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-clang-libc++ b/package/archlinux/PKGBUILD-clang-libc++ index e11965e27..88bc44219 100644 --- a/package/archlinux/PKGBUILD-clang-libc++ +++ b/package/archlinux/PKGBUILD-clang-libc++ @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2' 'libc++') makedepends=('cmake' 'clang' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index 30993b1f2..7de134779 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('emscripten-corrade') makedepends=('cmake' 'ninja') -options=(!strip !buildflags) +options=('!strip' '!buildflags' 'staticlibs') build() { if [ ! -d "$startdir/build-emscripten" ] ; then diff --git a/package/archlinux/PKGBUILD-es2 b/package/archlinux/PKGBUILD-es2 index a841a7229..c1c9e82d3 100644 --- a/package/archlinux/PKGBUILD-es2 +++ b/package/archlinux/PKGBUILD-es2 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal') makedepends=('cmake' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-es2desktop b/package/archlinux/PKGBUILD-es2desktop index bdceef969..97e88d78f 100644 --- a/package/archlinux/PKGBUILD-es2desktop +++ b/package/archlinux/PKGBUILD-es2desktop @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal') makedepends=('cmake' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-es3 b/package/archlinux/PKGBUILD-es3 index 4bcf048e0..dbecf3486 100644 --- a/package/archlinux/PKGBUILD-es3 +++ b/package/archlinux/PKGBUILD-es3 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal') makedepends=('cmake' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-es3desktop b/package/archlinux/PKGBUILD-es3desktop index e47b3fdfc..a84fa45ea 100644 --- a/package/archlinux/PKGBUILD-es3desktop +++ b/package/archlinux/PKGBUILD-es3desktop @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal') makedepends=('cmake' 'ninja') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-gcc46 b/package/archlinux/PKGBUILD-gcc46 index ba70ed497..15a1c6100 100644 --- a/package/archlinux/PKGBUILD-gcc46 +++ b/package/archlinux/PKGBUILD-gcc46 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'ninja' 'gcc46') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-gcc47 b/package/archlinux/PKGBUILD-gcc47 index 5867486a8..600cc598f 100644 --- a/package/archlinux/PKGBUILD-gcc47 +++ b/package/archlinux/PKGBUILD-gcc47 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'ninja' 'gcc47') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-gcc49 b/package/archlinux/PKGBUILD-gcc49 index a8043f0f2..02d6db4da 100644 --- a/package/archlinux/PKGBUILD-gcc49 +++ b/package/archlinux/PKGBUILD-gcc49 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('corrade' 'openal' 'freeglut' 'sdl2') makedepends=('cmake' 'ninja' 'gcc-git') -options=(!strip) +options=('!strip' 'staticlibs') provides=('magnum-git') build() { diff --git a/package/archlinux/PKGBUILD-mingw32 b/package/archlinux/PKGBUILD-mingw32 index 782719c79..594932067 100644 --- a/package/archlinux/PKGBUILD-mingw32 +++ b/package/archlinux/PKGBUILD-mingw32 @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-freeglut' 'mingw32-openal') makedepends=('mingw32-gcc' 'cmake' 'ninja' 'corrade') -options=(!buildflags !strip) +options=('!buildflags' '!strip' 'staticlibs') build() { mkdir -p "$startdir/build-win" diff --git a/package/archlinux/PKGBUILD-nacl-glibc b/package/archlinux/PKGBUILD-nacl-glibc index ba1684803..3a3477d09 100644 --- a/package/archlinux/PKGBUILD-nacl-glibc +++ b/package/archlinux/PKGBUILD-nacl-glibc @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('nacl-corrade') makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja') -options=(!buildflags !strip) +options=('!buildflags' '!strip' 'staticlibs') build() { # Build 32bit diff --git a/package/archlinux/PKGBUILD-nacl-newlib b/package/archlinux/PKGBUILD-nacl-newlib index 5d9409892..d2a23fb6f 100644 --- a/package/archlinux/PKGBUILD-nacl-newlib +++ b/package/archlinux/PKGBUILD-nacl-newlib @@ -8,7 +8,7 @@ url="http://mosra.cz/blog/magnum.php" license=('MIT') depends=('nacl-corrade') makedepends=('nacl-sdk' 'cmake' 'corrade' 'ninja') -options=(!buildflags !strip) +options=('!buildflags' '!strip' 'staticlibs') build() { # Build 32bit diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index 031abcd9d..61ff12d04 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -9,6 +9,7 @@ license=('MIT') depends=('corrade' 'openal' 'sdl2' 'freeglut') makedepends=('cmake' 'ninja') provides=('magnum-git') +options=('staticlibs') build() { mkdir -p "$startdir/build" diff --git a/package/archlinux/magnum-git/PKGBUILD b/package/archlinux/magnum-git/PKGBUILD index 45260cd8a..f48968bd3 100644 --- a/package/archlinux/magnum-git/PKGBUILD +++ b/package/archlinux/magnum-git/PKGBUILD @@ -1,6 +1,6 @@ # Author: mosra pkgname=magnum-git -pkgver=20130819 +pkgver=20140123 pkgrel=1 pkgdesc="C++11 and OpenGL 2D/3D graphics engine (Git version)" arch=('i686' 'x86_64') @@ -10,6 +10,7 @@ depends=('corrade-git' 'openal' 'freeglut') makedepends=('cmake' 'git') provides=('magnum') conflicts=('magnum') +options=('staticlibs') _gitroot="git://github.com/mosra/magnum.git" _gitname="magnum"