From ddffc1b58c3314f1773e3f583a12c5ad46c4676f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 31 Mar 2013 23:48:36 +0200 Subject: [PATCH] Separate PKGBUILDs for both NaCl newlib and glibc. --- PKGBUILD-nacl => PKGBUILD-nacl-glibc | 22 +++++++---- PKGBUILD-nacl-newlib | 57 ++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 8 deletions(-) rename PKGBUILD-nacl => PKGBUILD-nacl-glibc (67%) create mode 100644 PKGBUILD-nacl-newlib diff --git a/PKGBUILD-nacl b/PKGBUILD-nacl-glibc similarity index 67% rename from PKGBUILD-nacl rename to PKGBUILD-nacl-glibc index 22f79f985..2d71b326b 100644 --- a/PKGBUILD-nacl +++ b/PKGBUILD-nacl-glibc @@ -1,8 +1,8 @@ # Author: mosra pkgname=nacl-magnum -pkgver=dev +pkgver=dev.glibc pkgrel=1 -pkgdesc="OpenGL graphics engine (NaCl version)" +pkgdesc="OpenGL graphics engine (NaCl glibc version)" arch=('any') url="https://github.com/mosra/magnum" license=('MIT') @@ -12,38 +12,44 @@ options=(!buildflags !strip) build() { # Build 32bit - mkdir -p "$startdir/build-nacl-x86-32" - cd "$startdir/build-nacl-x86-32" + mkdir -p "$startdir/build-nacl-glibc-x86-32" + cd "$startdir/build-nacl-glibc-x86-32" cmake .. \ -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-glibc-x86-32.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/nacl \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ -DWITH_NACLAPPLICATION=ON \ -DLIB_SUFFIX=/32 make # Build 64bit - mkdir -p "$startdir/build-nacl-x86-64" - cd "$startdir/build-nacl-x86-64" + mkdir -p "$startdir/build-nacl-glibc-x86-64" + cd "$startdir/build-nacl-glibc-x86-64" cmake .. \ -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-glibc-x86-64.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/nacl \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ -DWITH_NACLAPPLICATION=ON make } package() { # Install 32bit - cd "$startdir/build-nacl-x86-32" + cd "$startdir/build-nacl-glibc-x86-32" make DESTDIR="$pkgdir/" install # Install 64bit (the headers will be overwritten, but they are (and should # be) the same for both versions - cd "$startdir/build-nacl-x86-64" + cd "$startdir/build-nacl-glibc-x86-64" make DESTDIR="$pkgdir/" install } diff --git a/PKGBUILD-nacl-newlib b/PKGBUILD-nacl-newlib new file mode 100644 index 000000000..0c5081041 --- /dev/null +++ b/PKGBUILD-nacl-newlib @@ -0,0 +1,57 @@ +# Author: mosra +pkgname=nacl-magnum +pkgver=dev.newlib +pkgrel=1 +pkgdesc="OpenGL graphics engine (NaCl newlib version)" +arch=('any') +url="https://github.com/mosra/magnum" +license=('MIT') +depends=('nacl-corrade') +makedepends=('nacl-sdk' 'cmake') +options=(!buildflags !strip) + +build() { + # Build 32bit + mkdir -p "$startdir/build-nacl-newlib-x86-32" + cd "$startdir/build-nacl-newlib-x86-32" + + cmake .. \ + -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ + -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-newlib-x86-32.cmake" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/nacl \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ + -DWITH_NACLAPPLICATION=ON \ + -DBUILD_STATIC=ON \ + -DLIB_SUFFIX=/32 + make + + # Build 64bit + mkdir -p "$startdir/build-nacl-newlib-x86-64" + cd "$startdir/build-nacl-newlib-x86-64" + + cmake .. \ + -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ + -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-newlib-x86-64.cmake" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/nacl \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ + -DWITH_NACLAPPLICATION=ON \ + -DBUILD_STATIC=ON + make +} + +package() { + # Install 32bit + cd "$startdir/build-nacl-newlib-x86-32" + make DESTDIR="$pkgdir/" install + + # Install 64bit (the headers will be overwritten, but they are (and should + # be) the same for both versions + cd "$startdir/build-nacl-newlib-x86-64" + make DESTDIR="$pkgdir/" install +}